♻️ Export bot-engine code into its own package

.gitignore

@@ -29,6 +29,7 @@ dump.sql
 dump.tar
 
 __env.js
+__ENV.js
 
 typebotsToFix.json
 **/scripts/logs

apps/builder/package.json

@@ -27,8 +27,6 @@
     "@googleapis/drive": "8.0.0",
     "@paralleldrive/cuid2": "2.2.1",
     "@sentry/nextjs": "7.66.0",
-    "@stripe/stripe-js": "1.54.1",
-    "@t3-oss/env-nextjs": "^0.6.0",
     "@tanstack/react-query": "^4.29.19",
     "@tanstack/react-table": "8.9.3",
     "@trpc/client": "10.34.0",
@@ -42,7 +40,6 @@
     "@udecode/plate-common": "^21.1.5",
     "@udecode/plate-core": "21.1.5",
     "@udecode/plate-link": "21.2.0",
-    "@udecode/plate-serializer-html": "21.1.5",
     "@udecode/plate-ui-link": "21.2.0",
     "@udecode/plate-ui-toolbar": "21.1.5",
     "@uiw/codemirror-extensions-langs": "^4.21.7",
@@ -85,7 +82,6 @@
     "sharp": "^0.32.4",
     "slate": "0.94.1",
     "slate-history": "0.93.0",
-    "slate-hyperscript": "0.77.0",
     "slate-react": "0.94.2",
     "stripe": "12.13.0",
     "svg-round-corners": "0.4.1",
@@ -94,7 +90,7 @@
     "trpc-openapi": "1.2.0",
     "unsplash-js": "^7.0.18",
     "use-debounce": "9.0.4",
-    "@typebot.io/viewer": "workspace:*"
+    "@typebot.io/bot-engine": "workspace:*"
   },
   "devDependencies": {
     "@chakra-ui/styled-system": "2.9.1",

apps/builder/src/features/analytics/api/getTotalAnswersInBlocks.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { PublicTypebot } from '@typebot.io/schemas'

apps/builder/src/features/auth/helpers/getAuthenticatedUser.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authOptions } from '@/pages/api/auth/[...nextauth]'
 import { setUser } from '@sentry/nextjs'
 import { User } from '@typebot.io/prisma'

apps/builder/src/features/billing/api/createCheckoutSession.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Plan } from '@typebot.io/prisma'

apps/builder/src/features/billing/api/createCustomCheckoutSession.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Plan } from '@typebot.io/prisma'

apps/builder/src/features/billing/api/getBillingPortalUrl.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import Stripe from 'stripe'

apps/builder/src/features/billing/api/getSubscription.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import Stripe from 'stripe'

apps/builder/src/features/billing/api/getUsage.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'

apps/builder/src/features/billing/api/listInvoices.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import Stripe from 'stripe'

apps/builder/src/features/billing/api/updateSubscription.ts

@@ -1,5 +1,5 @@
 import { sendTelemetryEvents } from '@typebot.io/lib/telemetry/sendTelemetryEvent'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Plan } from '@typebot.io/prisma'

apps/builder/src/features/billing/billing.spec.ts

@@ -51,7 +51,6 @@ test('should display valid usage', async ({ page }) => {
   await page.click('text=Settings & Members')
   await page.click('text=Billing & Usage')
   await expect(page.locator('text="/ 10,000"')).toBeVisible()
-  await expect(page.locator('text="/ 10 GB"')).toBeVisible()
   await page.getByText('Members', { exact: true }).click()
   await expect(
     page.getByRole('heading', { name: 'Members (1/5)' })
@@ -63,7 +62,6 @@ test('should display valid usage', async ({ page }) => {
   await page.click('text=Settings & Members')
   await page.click('text=Billing & Usage')
   await expect(page.locator('text="/ 100,000"')).toBeVisible()
-  await expect(page.locator('text="/ 50 GB"')).toBeVisible()
   await expect(page.getByText('Upgrade to Starter')).toBeHidden()
   await expect(page.getByText('Upgrade to Pro')).toBeHidden()
   await expect(page.getByText('Need custom limits?')).toBeHidden()
@@ -78,7 +76,6 @@ test('should display valid usage', async ({ page }) => {
   await page.click('text=Settings & Members')
   await page.click('text=Billing & Usage')
   await expect(page.locator('text="/ 200"')).toBeVisible()
-  await expect(page.locator('text="Storage"')).toBeHidden()
   await page.getByText('Members', { exact: true }).click()
   await expect(
     page.getByRole('heading', { name: 'Members (1/1)' })
@@ -95,17 +92,11 @@ test('should display valid usage', async ({ page }) => {
   await page.click('text=Settings & Members')
   await page.click('text=Billing & Usage')
   await expect(page.locator('text="/ 2,000"')).toBeVisible()
-  await expect(page.locator('text="/ 2 GB"')).toBeVisible()
   await expect(page.locator('text="10" >> nth=0')).toBeVisible()
   await expect(page.locator('[role="progressbar"] >> nth=0')).toHaveAttribute(
     'aria-valuenow',
     '1'
   )
-  await expect(page.locator('text="1.07 GB"')).toBeVisible()
-  await expect(page.locator('[role="progressbar"] >> nth=1')).toHaveAttribute(
-    'aria-valuenow',
-    '54'
-  )
 
   await injectFakeResults({
     typebotId: usageTypebotId,
@@ -116,10 +107,7 @@ test('should display valid usage', async ({ page }) => {
   await page.click('text="Billing & Usage"')
   await expect(page.locator('text="/ 2,000"')).toBeVisible()
   await expect(page.locator('text="1,100"')).toBeVisible()
-  await expect(page.locator('text="/ 2 GB"')).toBeVisible()
-  await expect(page.locator('text="2.25 GB"')).toBeVisible()
   await expect(page.locator('[aria-valuenow="55"]')).toBeVisible()
-  await expect(page.locator('[aria-valuenow="112"]')).toBeVisible()
 })
 
 test('plan changes should work', async ({ page }) => {
@@ -160,9 +148,7 @@ test('plan changes should work', async ({ page }) => {
   await page.click('text=Settings & Members')
   await page.click('text=Billing & Usage')
   await expect(page.locator('text="/ 2,000"')).toBeVisible()
-  await expect(page.locator('text="/ 2 GB"')).toBeVisible()
   await expect(page.getByText('/ 2,000')).toBeVisible()
-  await expect(page.getByText('/ 2 GB')).toBeVisible()
   await page.click('button >> text="2,000"')
   await page.click('button >> text="3,500"')
   await page.click('button >> text="2"')
@@ -178,7 +164,6 @@ test('plan changes should work', async ({ page }) => {
   await page.click('text="Billing & Usage"')
   await expect(page.locator('text="$73"')).toBeVisible()
   await expect(page.locator('text="/ 3,500"')).toBeVisible()
-  await expect(page.locator('text="/ 4 GB"')).toBeVisible()
   await expect(page.getByRole('button', { name: '3,500' })).toBeVisible()
   await expect(page.getByRole('button', { name: '4' })).toBeVisible()
 

apps/builder/src/features/blocks/inputs/fileUpload/fileUpload.spec.ts

@@ -36,7 +36,6 @@ test('options should work', async ({ page }) => {
   await page.fill('[value="Upload"]', 'Go')
   await page.fill('[value="Clear"]', 'Reset')
   await page.fill('[value="Skip"]', 'Pass')
-  await page.fill('input[value="10"]', '20')
   await page.click('text="Restart"')
   await expect(page.locator(`text="Pass"`)).toBeVisible()
   await expect(page.locator(`text="Upload now!!"`)).toBeVisible()

apps/builder/src/features/blocks/integrations/openai/api/listModels.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'

apps/builder/src/features/blocks/integrations/webhook/api/getResultExample.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { canReadTypebots } from '@/helpers/databaseRules'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'

apps/builder/src/features/blocks/integrations/webhook/api/listWebhookBlocks.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { canReadTypebots } from '@/helpers/databaseRules'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'

apps/builder/src/features/blocks/integrations/webhook/api/subscribeWebhook.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { canWriteTypebots } from '@/helpers/databaseRules'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'

apps/builder/src/features/blocks/integrations/webhook/api/unsubscribeWebhook.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { canWriteTypebots } from '@/helpers/databaseRules'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'

apps/builder/src/features/blocks/integrations/zemanticAi/api/listProjects.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'

apps/builder/src/features/blocks/logic/typebotLink/api/getLinkedTypebots.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { LogicBlockType, typebotSchema } from '@typebot.io/schemas'

apps/builder/src/features/blocks/logic/typebotLink/helpers/fetchLinkedTypebots.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { canReadTypebots } from '@/helpers/databaseRules'
 import { User } from '@typebot.io/prisma'
 import { LogicBlockType, PublicTypebot, Typebot } from '@typebot.io/schemas'

apps/builder/src/features/collaboration/api/getCollaborators.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'

apps/builder/src/features/collaboration/collaboration.spec.ts

@@ -1,7 +1,7 @@
 import test, { expect } from '@playwright/test'
 import { createId } from '@paralleldrive/cuid2'
 import { CollaborationType, Plan, WorkspaceRole } from '@typebot.io/prisma'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { InputBlockType, defaultTextInputOptions } from '@typebot.io/schemas'
 import {
   createTypebots,

apps/builder/src/features/credentials/api/createCredentials.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { stripeCredentialsSchema } from '@typebot.io/schemas/features/blocks/inputs/payment/schemas'

apps/builder/src/features/credentials/api/deleteCredentials.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'

apps/builder/src/features/credentials/api/listCredentials.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { stripeCredentialsSchema } from '@typebot.io/schemas/features/blocks/inputs/payment/schemas'

apps/builder/src/features/customDomains/api/createCustomDomain.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'

apps/builder/src/features/customDomains/api/deleteCustomDomain.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'

apps/builder/src/features/customDomains/api/listCustomDomains.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'

apps/builder/src/features/customDomains/api/verifyCustomDomain.ts

@@ -7,7 +7,7 @@ import {
   domainResponseSchema,
   domainVerificationStatusSchema,
 } from '@typebot.io/schemas/features/customDomains'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { isWriteWorkspaceForbidden } from '@/features/workspace/helpers/isWriteWorkspaceForbidden'
 import { TRPCError } from '@trpc/server'
 import { env } from '@typebot.io/env'

apps/builder/src/features/results/api/deleteResults.ts

@@ -3,7 +3,7 @@ import { TRPCError } from '@trpc/server'
 import { Group } from '@typebot.io/schemas'
 import { z } from 'zod'
 import { archiveResults } from '@typebot.io/lib/api/helpers/archiveResults'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { isWriteTypebotForbidden } from '@/features/typebot/helpers/isWriteTypebotForbidden'
 
 export const deleteResults = authenticatedProcedure

apps/builder/src/features/results/api/getResult.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { ResultWithAnswers, resultWithAnswersSchema } from '@typebot.io/schemas'

apps/builder/src/features/results/api/getResultLogs.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { logSchema } from '@typebot.io/schemas'
 import { z } from 'zod'

apps/builder/src/features/results/api/getResults.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { ResultWithAnswers, resultWithAnswersSchema } from '@typebot.io/schemas'

apps/builder/src/features/theme/api/deleteThemeTemplate.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { ThemeTemplate, themeTemplateSchema } from '@typebot.io/schemas'

apps/builder/src/features/theme/api/listThemeTemplates.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { ThemeTemplate, themeTemplateSchema } from '@typebot.io/schemas'

apps/builder/src/features/theme/api/saveThemeTemplate.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { ThemeTemplate, themeTemplateSchema } from '@typebot.io/schemas'

apps/builder/src/features/typebot/api/createTypebot.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Plan, WorkspaceRole } from '@typebot.io/prisma'

apps/builder/src/features/typebot/api/deleteTypebot.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Group } from '@typebot.io/schemas'

apps/builder/src/features/typebot/api/getPublishedTypebot.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { publicTypebotSchema } from '@typebot.io/schemas'

apps/builder/src/features/typebot/api/getTypebot.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Typebot, typebotSchema } from '@typebot.io/schemas'

apps/builder/src/features/typebot/api/listTypebots.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { WorkspaceRole } from '@typebot.io/prisma'

apps/builder/src/features/typebot/api/publishTypebot.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { InputBlockType, typebotSchema } from '@typebot.io/schemas'

apps/builder/src/features/typebot/api/unpublishTypebot.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'

apps/builder/src/features/typebot/api/updateTypebot.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { typebotCreateSchema, typebotSchema } from '@typebot.io/schemas'

apps/builder/src/features/typebot/helpers/isReadTypebotForbidden.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { env } from '@typebot.io/env'
 import { CollaboratorsOnTypebots, User } from '@typebot.io/prisma'
 import { Typebot } from '@typebot.io/schemas'

apps/builder/src/features/typebot/helpers/isWriteTypebotForbidden.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import {
   CollaborationType,
   CollaboratorsOnTypebots,

apps/builder/src/features/typebot/helpers/sanitizers.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { Plan } from '@typebot.io/prisma'
 import {
   Block,

apps/builder/src/features/upload/api/generateUploadUrl.ts

@@ -3,7 +3,7 @@ import { z } from 'zod'
 import { env } from '@typebot.io/env'
 import { TRPCError } from '@trpc/server'
 import { generatePresignedPostPolicy } from '@typebot.io/lib/s3/generatePresignedPostPolicy'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { isWriteWorkspaceForbidden } from '@/features/workspace/helpers/isWriteWorkspaceForbidden'
 import { isWriteTypebotForbidden } from '@/features/typebot/helpers/isWriteTypebotForbidden'
 

apps/builder/src/features/whatsapp/generateVerificationToken.ts

@@ -1,6 +1,6 @@
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { z } from 'zod'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { createId } from '@paralleldrive/cuid2'
 
 export const generateVerificationToken = authenticatedProcedure

apps/builder/src/features/whatsapp/getPhoneNumber.ts

@@ -1,7 +1,7 @@
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { z } from 'zod'
 import got from 'got'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { decrypt } from '@typebot.io/lib/api'
 import { TRPCError } from '@trpc/server'
 import { WhatsAppCredentials } from '@typebot.io/schemas/features/whatsapp'

apps/builder/src/features/whatsapp/getSystemTokenInfo.ts

@@ -3,7 +3,7 @@ import { z } from 'zod'
 import got from 'got'
 import { TRPCError } from '@trpc/server'
 import { WhatsAppCredentials } from '@typebot.io/schemas/features/whatsapp'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { decrypt } from '@typebot.io/lib/api/encryption'
 
 const inputSchema = z.object({

apps/builder/src/features/whatsapp/receiveMessagePreview.ts

@@ -1,7 +1,7 @@
 import { publicProcedure } from '@/helpers/server/trpc'
 import { whatsAppWebhookRequestBodySchema } from '@typebot.io/schemas/features/whatsapp'
 import { z } from 'zod'
-import { resumeWhatsAppFlow } from '@typebot.io/viewer/src/features/whatsApp/helpers/resumeWhatsAppFlow'
+import { resumeWhatsAppFlow } from '@typebot.io/bot-engine/whatsapp/resumeWhatsAppFlow'
 import { isNotDefined } from '@typebot.io/lib'
 import { TRPCError } from '@trpc/server'
 import { env } from '@typebot.io/env'

apps/builder/src/features/whatsapp/startWhatsAppPreview.ts

@@ -1,14 +1,14 @@
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
-import { sendWhatsAppMessage } from '@typebot.io/lib/whatsApp/sendWhatsAppMessage'
+import { startSession } from '@typebot.io/bot-engine/startSession'
-import { startSession } from '@typebot.io/viewer/src/features/chat/helpers/startSession'
 import { env } from '@typebot.io/env'
 import { HTTPError } from 'got'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
-import { sendChatReplyToWhatsApp } from '@typebot.io/lib/whatsApp/sendChatReplyToWhatsApp'
+import { saveStateToDatabase } from '@typebot.io/bot-engine/saveStateToDatabase'
-import { saveStateToDatabase } from '@typebot.io/viewer/src/features/chat/helpers/saveStateToDatabase'
+import { restartSession } from '@typebot.io/bot-engine/queries/restartSession'
-import { restartSession } from '@typebot.io/viewer/src/features/chat/queries/restartSession'
+import { sendChatReplyToWhatsApp } from '@typebot.io/bot-engine/whatsapp/sendChatReplyToWhatsApp'
+import { sendWhatsAppMessage } from '@typebot.io/bot-engine/whatsapp/sendWhatsAppMessage'
 import { isReadTypebotForbidden } from '../typebot/helpers/isReadTypebotForbidden'
 import { SessionState } from '@typebot.io/schemas'
 

apps/builder/src/features/whatsapp/verifyIfPhoneNumberAvailable.ts

@@ -1,6 +1,6 @@
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { z } from 'zod'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 
 export const verifyIfPhoneNumberAvailable = authenticatedProcedure
   .meta({

apps/builder/src/features/workspace/api/createWorkspace.ts

@@ -1,5 +1,5 @@
 import { sendTelemetryEvents } from '@typebot.io/lib/telemetry/sendTelemetryEvent'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Workspace, workspaceSchema } from '@typebot.io/schemas'

apps/builder/src/features/workspace/api/deleteWorkspace.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { z } from 'zod'
 import { isAdminWriteWorkspaceForbidden } from '../helpers/isAdminWriteWorkspaceForbidden'

apps/builder/src/features/workspace/api/getWorkspace.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { workspaceSchema } from '@typebot.io/schemas'

apps/builder/src/features/workspace/api/listInvitationsInWorkspace.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { workspaceInvitationSchema } from '@typebot.io/schemas'

apps/builder/src/features/workspace/api/listMembersInWorkspace.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { workspaceMemberSchema } from '@typebot.io/schemas'

apps/builder/src/features/workspace/api/listWorkspaces.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { workspaceSchema } from '@typebot.io/schemas'

apps/builder/src/features/workspace/api/updateWorkspace.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { workspaceSchema } from '@typebot.io/schemas'

apps/builder/src/helpers/databaseRules.ts

@@ -5,7 +5,7 @@ import {
   User,
   WorkspaceRole,
 } from '@typebot.io/prisma'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiResponse } from 'next'
 import { forbidden } from '@typebot.io/lib/api'
 import { env } from '@typebot.io/env'

apps/builder/src/lib/googleSheets.ts

@@ -3,8 +3,8 @@ import { OAuth2Client, Credentials } from 'google-auth-library'
 import { GoogleSheetsCredentials } from '@typebot.io/schemas'
 import { isDefined } from '@typebot.io/lib'
 import { decrypt, encrypt } from '@typebot.io/lib/api'
-import prisma from './prisma'
 import { env } from '@typebot.io/env'
+import prisma from '@typebot.io/lib/prisma'
 
 export const oauth2Client = new OAuth2Client(
   env.GOOGLE_CLIENT_ID,

apps/builder/src/lib/prisma.ts

@@ -1,22 +0,0 @@
-/**
- * Instantiates a single instance PrismaClient and save it on the global object.
- * @link https://www.prisma.io/docs/support/help-articles/nextjs-prisma-client-dev-practices
- */
-import { env } from '@typebot.io/env'
-import { PrismaClient } from '@typebot.io/prisma'
-
-const prismaGlobal = global as typeof global & {
-  prisma?: PrismaClient
-}
-
-const prisma: PrismaClient =
-  prismaGlobal.prisma ||
-  new PrismaClient({
-    log: env.NODE_ENV === 'development' ? ['error', 'warn'] : ['error'],
-  })
-
-if (env.NODE_ENV !== 'production') {
-  prismaGlobal.prisma = prisma
-}
-
-export default prisma

apps/builder/src/pages/api/auth/[...nextauth].ts

@@ -5,7 +5,7 @@ import GitlabProvider from 'next-auth/providers/gitlab'
 import GoogleProvider from 'next-auth/providers/google'
 import FacebookProvider from 'next-auth/providers/facebook'
 import AzureADProvider from 'next-auth/providers/azure-ad'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { Provider } from 'next-auth/providers'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { customAdapter } from '../../../features/auth/api/customAdapter'

apps/builder/src/pages/api/credentials.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { Credentials } from '@typebot.io/schemas'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'

apps/builder/src/pages/api/credentials/[credentialsId].ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import {
   badRequest,

apps/builder/src/pages/api/credentials/google-sheets/callback.ts

@@ -1,6 +1,6 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 import { Prisma } from '@typebot.io/prisma'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { googleSheetsScopes } from './consent-url'
 import { stringify } from 'querystring'
 import { badRequest, encrypt, notAuthenticated } from '@typebot.io/lib/api'

apps/builder/src/pages/api/customDomains/[domain].ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import {
   badRequest,

apps/builder/src/pages/api/folders.ts

@@ -1,5 +1,5 @@
 import { DashboardFolder, WorkspaceRole } from '@typebot.io/prisma'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import {
   badRequest,

apps/builder/src/pages/api/folders/[id].ts

@@ -1,5 +1,5 @@
 import { DashboardFolder } from '@typebot.io/prisma'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'

apps/builder/src/pages/api/publicIdAvailable.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'

apps/builder/src/pages/api/publicTypebots.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { InputBlockType, PublicTypebot } from '@typebot.io/schemas'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { canPublishFileInput } from '@/helpers/databaseRules'

apps/builder/src/pages/api/publicTypebots/[id].ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { InputBlockType, PublicTypebot } from '@typebot.io/schemas'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { canPublishFileInput, canWriteTypebots } from '@/helpers/databaseRules'

apps/builder/src/pages/api/stripe/webhook.ts

@@ -3,7 +3,7 @@ import { methodNotAllowed } from '@typebot.io/lib/api'
 import Stripe from 'stripe'
 import Cors from 'micro-cors'
 import { buffer } from 'micro'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { Plan, WorkspaceRole } from '@typebot.io/prisma'
 import { RequestHandler } from 'next/dist/server/next'
 import { sendTelemetryEvents } from '@typebot.io/lib/telemetry/sendTelemetryEvent'

apps/builder/src/pages/api/typebots/[typebotId]/analytics/stats.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { Stats } from '@typebot.io/schemas'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { canReadTypebots } from '@/helpers/databaseRules'

apps/builder/src/pages/api/typebots/[typebotId]/blocks.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { canReadTypebots } from '@/helpers/databaseRules'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'

apps/builder/src/pages/api/typebots/[typebotId]/collaborators.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { canReadTypebots } from '@/helpers/databaseRules'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'

apps/builder/src/pages/api/typebots/[typebotId]/collaborators/[userId].ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { canEditGuests } from '@/helpers/databaseRules'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'

apps/builder/src/pages/api/typebots/[typebotId]/invitations.ts

@@ -1,5 +1,5 @@
 import { CollaborationType, WorkspaceRole } from '@typebot.io/prisma'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import {
   canReadTypebots,

apps/builder/src/pages/api/typebots/[typebotId]/invitations/[email].ts

@@ -1,5 +1,5 @@
 import { Invitation } from '@typebot.io/prisma'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { canEditGuests } from '@/helpers/databaseRules'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'

apps/builder/src/pages/api/users/[userId].ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'

apps/builder/src/pages/api/users/[userId]/api-tokens.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { generateId } from '@typebot.io/lib'

apps/builder/src/pages/api/users/[userId]/api-tokens/[tokenId].ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'

apps/builder/src/pages/api/workspaces/[workspaceId]/invitations.ts

@@ -1,5 +1,5 @@
 import { WorkspaceInvitation, WorkspaceRole } from '@typebot.io/prisma'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import {
   forbidden,

apps/builder/src/pages/api/workspaces/[workspaceId]/invitations/[id].ts

@@ -1,5 +1,5 @@
 import { WorkspaceInvitation, WorkspaceRole } from '@typebot.io/prisma'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'

apps/builder/src/pages/api/workspaces/[workspaceId]/members.ts

@@ -1,4 +1,4 @@
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import {

apps/builder/src/pages/api/workspaces/[workspaceId]/members/[id].ts

@@ -1,5 +1,5 @@
 import { MemberInWorkspace, WorkspaceRole } from '@typebot.io/prisma'
-import prisma from '@/lib/prisma'
+import prisma from '@typebot.io/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'

apps/builder/tsconfig.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*", "../viewer/src/*"]
+      "@/*": ["src/*"]
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]

apps/docs/openapi/builder/_spec_.json

@@ -1565,7 +1565,8 @@
                                                 "additionalProperties": false
                                               },
                                               "sizeLimit": {
-                                                "type": "number"
+                                                "type": "number",
+                                                "description": "Deprecated"
                                               }
                                             },
                                             "required": [
@@ -5952,7 +5953,8 @@
                                             "additionalProperties": false
                                           },
                                           "sizeLimit": {
-                                            "type": "number"
+                                            "type": "number",
+                                            "description": "Deprecated"
                                           }
                                         },
                                         "required": [
@@ -9974,7 +9976,8 @@
                                               "additionalProperties": false
                                             },
                                             "sizeLimit": {
-                                              "type": "number"
+                                              "type": "number",
+                                              "description": "Deprecated"
                                             }
                                           },
                                           "required": [
@@ -14136,7 +14139,8 @@
                                             "additionalProperties": false
                                           },
                                           "sizeLimit": {
-                                            "type": "number"
+                                            "type": "number",
+                                            "description": "Deprecated"
                                           }
                                         },
                                         "required": [
@@ -18178,7 +18182,8 @@
                                               "additionalProperties": false
                                             },
                                             "sizeLimit": {
-                                              "type": "number"
+                                              "type": "number",
+                                              "description": "Deprecated"
                                             }
                                           },
                                           "required": [
@@ -22275,7 +22280,8 @@
                                               "additionalProperties": false
                                             },
                                             "sizeLimit": {
-                                              "type": "number"
+                                              "type": "number",
+                                              "description": "Deprecated"
                                             }
                                           },
                                           "required": [
@@ -26435,7 +26441,8 @@
                                               "additionalProperties": false
                                             },
                                             "sizeLimit": {
-                                              "type": "number"
+                                              "type": "number",
+                                              "description": "Deprecated"
                                             }
                                           },
                                           "required": [
@@ -33600,12 +33607,17 @@
                     "presignedUrl": {
                       "type": "string"
                     },
+                    "formData": {
+                      "type": "object",
+                      "additionalProperties": {}
+                    },
                     "fileUrl": {
                       "type": "string"
                     }
                   },
                   "required": [
                     "presignedUrl",
+                    "formData",
                     "fileUrl"
                   ],
                   "additionalProperties": false

apps/docs/openapi/chat/_spec_.json

@@ -1148,7 +1148,8 @@
                                                     "additionalProperties": false
                                                   },
                                                   "sizeLimit": {
-                                                    "type": "number"
+                                                    "type": "number",
+                                                    "description": "Deprecated"
                                                   }
                                                 },
                                                 "required": [
@@ -5075,7 +5076,8 @@
                                       "additionalProperties": false
                                     },
                                     "sizeLimit": {
-                                      "type": "number"
+                                      "type": "number",
+                                      "description": "Deprecated"
                                     }
                                   },
                                   "required": [
@@ -6348,12 +6350,17 @@
                     "presignedUrl": {
                       "type": "string"
                     },
+                    "formData": {
+                      "type": "object",
+                      "additionalProperties": {}
+                    },
                     "hasReachedStorageLimit": {
                       "type": "boolean"
                     }
                   },
                   "required": [
                     "presignedUrl",
+                    "formData",
                     "hasReachedStorageLimit"
                   ],
                   "additionalProperties": false
@@ -6428,12 +6435,17 @@
                     "presignedUrl": {
                       "type": "string"
                     },
+                    "formData": {
+                      "type": "object",
+                      "additionalProperties": {}
+                    },
                     "fileUrl": {
                       "type": "string"
                     }
                   },
                   "required": [
                     "presignedUrl",
+                    "formData",
                     "fileUrl"
                   ],
                   "additionalProperties": false
@@ -6499,7 +6511,10 @@
     "/workspaces/{workspaceId}/whatsapp/phoneNumbers/{phoneNumberId}/webhook": {
       "get": {
         "operationId": "whatsAppRouter-subscribeWebhook",
-        "summary": "Subscribe WhatsApp webhook",
+        "summary": "Subscribe webhook",
+        "tags": [
+          "WhatsApp"
+        ],
         "security": [
           {
             "Authorization": []
@@ -6557,7 +6572,10 @@
       },
       "post": {
         "operationId": "whatsAppRouter-receiveMessage",
-        "summary": "Receive WhatsApp Message",
+        "summary": "Message webhook",
+        "tags": [
+          "WhatsApp"
+        ],
         "requestBody": {
           "required": true,
           "content": {

apps/viewer/package.json

@@ -16,27 +16,21 @@
     "@trpc/server": "10.34.0",
     "@typebot.io/nextjs": "workspace:*",
     "@typebot.io/prisma": "workspace:*",
-    "@udecode/plate-common": "^21.1.5",
     "ai": "2.1.32",
     "bot-engine": "workspace:*",
-    "chrono-node": "2.6.6",
     "cors": "2.8.5",
-    "date-fns": "^2.30.0",
-    "eventsource-parser": "^1.0.0",
     "google-spreadsheet": "4.0.2",
     "got": "12.6.0",
-    "libphonenumber-js": "1.10.37",
     "next": "13.4.3",
     "nextjs-cors": "2.1.2",
-    "node-html-parser": "^6.1.5",
     "nodemailer": "6.9.3",
     "openai-edge": "1.2.2",
     "qs": "6.11.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "remark-slate": "^1.8.6",
     "stripe": "12.13.0",
-    "trpc-openapi": "1.2.0"
+    "trpc-openapi": "1.2.0",
+    "@typebot.io/bot-engine": "workspace:*"
   },
   "devDependencies": {
     "@faire/mjml-react": "3.3.0",
@@ -53,13 +47,11 @@
     "@types/papaparse": "5.3.7",
     "@types/qs": "6.9.7",
     "@types/react": "18.2.15",
-    "@types/sanitize-html": "2.9.0",
     "dotenv-cli": "^7.2.1",
     "eslint": "8.44.0",
     "eslint-config-custom": "workspace:*",
     "google-auth-library": "8.9.0",
     "next-runtime-env": "^1.6.2",
-    "node-fetch": "3.3.1",
     "papaparse": "5.4.1",
     "superjson": "1.12.4",
     "typescript": "5.1.6",

apps/viewer/src/features/blocks/integrations/googleSheets/helpers/getAuthenticatedGoogleDoc.ts

@@ -1,24 +0,0 @@
-import { getAuthenticatedGoogleClient } from '@/lib/google-sheets'
-import { TRPCError } from '@trpc/server'
-import { GoogleSpreadsheet } from 'google-spreadsheet'
-
-export const getAuthenticatedGoogleDoc = async ({
-  credentialsId,
-  spreadsheetId,
-}: {
-  credentialsId?: string
-  spreadsheetId?: string
-}) => {
-  if (!credentialsId || !spreadsheetId)
-    throw new TRPCError({
-      code: 'BAD_REQUEST',
-      message: 'Missing credentialsId or spreadsheetId',
-    })
-  const auth = await getAuthenticatedGoogleClient(credentialsId)
-  if (!auth)
-    throw new TRPCError({
-      code: 'NOT_FOUND',
-      message: "Couldn't find credentials in database",
-    })
-  return new GoogleSpreadsheet(spreadsheetId, auth)
-}

apps/viewer/src/features/blocks/logic/typebotLink/fetchLinkedTypebots.ts

@@ -1,34 +0,0 @@
-import { canReadTypebots } from '@/helpers/api/dbRules'
-import prisma from '@/lib/prisma'
-import { User } from '@typebot.io/prisma'
-import { PublicTypebot, Typebot } from '@typebot.io/schemas'
-
-type Props = {
-  isPreview?: boolean
-  typebotIds: string[]
-  user?: User
-}
-
-export const fetchLinkedTypebots = async ({
-  user,
-  isPreview,
-  typebotIds,
-}: Props) => {
-  const linkedTypebots = (
-    isPreview
-      ? await prisma.typebot.findMany({
-          where: user
-            ? {
-                AND: [
-                  { id: { in: typebotIds } },
-                  canReadTypebots(typebotIds, user as User),
-                ],
-              }
-            : { id: { in: typebotIds } },
-        })
-      : await prisma.publicTypebot.findMany({
-          where: { id: { in: typebotIds } },
-        })
-  ) as (Typebot | PublicTypebot)[]
-  return linkedTypebots
-}

apps/viewer/src/features/chat/api/sendMessage.ts

@@ -1,15 +1,15 @@
 import { publicProcedure } from '@/helpers/server/trpc'
-import { saveStateToDatabase } from '../helpers/saveStateToDatabase'
-import { getSession } from '../queries/getSession'
-import { continueBotFlow } from '../helpers/continueBotFlow'
-import { parseDynamicTheme } from '../helpers/parseDynamicTheme'
-import { startSession } from '../helpers/startSession'
-import { restartSession } from '../queries/restartSession'
 import {
   chatReplySchema,
   sendMessageInputSchema,
 } from '@typebot.io/schemas/features/chat/schema'
 import { TRPCError } from '@trpc/server'
+import { getSession } from '@typebot.io/bot-engine/queries/getSession'
+import { startSession } from '@typebot.io/bot-engine/startSession'
+import { saveStateToDatabase } from '@typebot.io/bot-engine/saveStateToDatabase'
+import { restartSession } from '@typebot.io/bot-engine/queries/restartSession'
+import { continueBotFlow } from '@typebot.io/bot-engine/continueBotFlow'
+import { parseDynamicTheme } from '@typebot.io/bot-engine/parseDynamicTheme'
 
 export const sendMessage = publicProcedure
   .meta({

apps/viewer/src/features/chat/api/updateTypebotInSession.ts

@@ -1,14 +1,14 @@
 import { publicProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'
-import { getSession } from '../queries/getSession'
+import { getSession } from '@typebot.io/bot-engine/queries/getSession'
-import prisma from '@/lib/prisma'
 import {
   PublicTypebot,
   SessionState,
   Typebot,
   Variable,
 } from '@typebot.io/schemas'
+import prisma from '@typebot.io/lib/prisma'
 
 export const updateTypebotInSession = publicProcedure
   .meta({

apps/viewer/src/features/fileUpload/api/deprecated/getUploadUrl.ts

@@ -1,5 +1,4 @@
 import { publicProcedure } from '@/helpers/server/trpc'
-import prisma from '@/lib/prisma'
 import { TRPCError } from '@trpc/server'
 import {
   FileInputBlock,
@@ -12,6 +11,7 @@ import { byId, isDefined } from '@typebot.io/lib'
 import { z } from 'zod'
 import { generatePresignedPostPolicy } from '@typebot.io/lib/s3/generatePresignedPostPolicy'
 import { env } from '@typebot.io/env'
+import prisma from '@typebot.io/lib/prisma'
 
 export const getUploadUrl = publicProcedure
   .meta({

apps/viewer/src/features/fileUpload/api/generateUploadUrl.ts

@@ -1,10 +1,10 @@
 import { publicProcedure } from '@/helpers/server/trpc'
-import prisma from '@/lib/prisma'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'
 import { generatePresignedPostPolicy } from '@typebot.io/lib/s3/generatePresignedPostPolicy'
 import { env } from '@typebot.io/env'
 import { InputBlockType, publicTypebotSchema } from '@typebot.io/schemas'
+import prisma from '@typebot.io/lib/prisma'
 
 export const generateUploadUrl = publicProcedure
   .meta({

apps/viewer/src/features/whatsapp/api/receiveMessage.ts

@@ -1,8 +1,8 @@
 import { publicProcedure } from '@/helpers/server/trpc'
 import { whatsAppWebhookRequestBodySchema } from '@typebot.io/schemas/features/whatsapp'
-import { resumeWhatsAppFlow } from '../helpers/resumeWhatsAppFlow'
 import { z } from 'zod'
 import { isNotDefined } from '@typebot.io/lib'
+import { resumeWhatsAppFlow } from '@typebot.io/bot-engine/whatsapp/resumeWhatsAppFlow'
 
 export const receiveMessage = publicProcedure
   .meta({