♻️ 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,