🚸 Improve parsing preprocessing on typebots

baptisteArno · Aug 23, 2023 · 0acede9 · 0acede9 · vercel · Aug 23, 2023
1 parent fe54888
commit 0acede9
Show file tree

Hide file tree

Showing 24 changed files with 132 additions and 584 deletions.
diff --git a/apps/builder/src/features/blocks/integrations/webhook/queries/createWebhookQuery.ts b/apps/builder/src/features/blocks/integrations/webhook/queries/createWebhookQuery.ts
diff --git a/apps/builder/src/features/blocks/integrations/webhook/queries/duplicateWebhookQuery.ts b/apps/builder/src/features/blocks/integrations/webhook/queries/duplicateWebhookQuery.ts
diff --git a/apps/builder/src/features/blocks/integrations/webhook/queries/updateWebhookQuery.ts b/apps/builder/src/features/blocks/integrations/webhook/queries/updateWebhookQuery.ts
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/api/getLinkedTypebots.ts b/apps/builder/src/features/blocks/logic/typebotLink/api/getLinkedTypebots.ts
@@ -24,7 +24,7 @@ export const getLinkedTypebots = authenticatedProcedure
   .output(
     z.object({
       typebots: z.array(
-        typebotSchema.pick({
+        typebotSchema._def.schema.pick({
           id: true,
           groups: true,
           variables: true,
@@ -58,7 +58,7 @@ export const getLinkedTypebots = authenticatedProcedure
       throw new TRPCError({ code: 'NOT_FOUND', message: 'No typebot found' })
 
     const linkedTypebotIds =
-      typebotSchema.shape.groups
+      typebotSchema._def.schema.shape.groups
         .parse(typebot.groups)
         .flatMap((group) => group.blocks)
         .reduce<string[]>(
@@ -102,8 +102,10 @@ export const getLinkedTypebots = authenticatedProcedure
       })
       .map((typebot) => ({
         ...typebot,
-        groups: typebotSchema.shape.groups.parse(typebot.groups),
-        variables: typebotSchema.shape.variables.parse(typebot.variables),
+        groups: typebotSchema._def.schema.shape.groups.parse(typebot.groups),
+        variables: typebotSchema._def.schema.shape.variables.parse(
+          typebot.variables
+        ),
       }))
 
     return {

diff --git a/apps/builder/src/features/dashboard/api/parseNewTypebot.ts b/apps/builder/src/features/dashboard/api/parseNewTypebot.ts
diff --git a/apps/builder/src/features/publish/publish.spec.ts b/apps/builder/src/features/publish/publish.spec.ts
@@ -33,9 +33,7 @@ test('should not be able to submit taken url ID', async ({ page }) => {
   await page.getByRole('textbox').press('Enter')
   await expect(
     page
-      .getByText(
-        'Should contain only contain letters, numbers. Words can be separated by dashes.'
-      )
+      .getByText('Can only contain lowercase letters, numbers and dashes.')
       .nth(0)
   ).toBeVisible()
   await page.getByText(`${typebotId}-public`).click()

diff --git a/apps/builder/src/features/templates/components/ImportTypebotFromFileButton.tsx b/apps/builder/src/features/templates/components/ImportTypebotFromFileButton.tsx
@@ -1,4 +1,3 @@
-import { parseInvalidTypebot } from '@/features/typebot/helpers/parseInvalidTypebot'
 import { useToast } from '@/hooks/useToast'
 import { Button, ButtonProps, chakra } from '@chakra-ui/react'
 import { Typebot, typebotCreateSchema } from '@typebot.io/schemas'
@@ -19,9 +18,7 @@ export const ImportTypebotFromFileButton = ({
     const file = e.target.files[0]
     const fileContent = await readFile(file)
     try {
-      const typebot = typebotCreateSchema.parse(
-        parseInvalidTypebot(JSON.parse(fileContent))
-      )
+      const typebot = typebotCreateSchema.parse(JSON.parse(fileContent))
       onNewTypebot(typebot as Typebot)
     } catch (err) {
       console.error(err)

diff --git a/apps/builder/src/features/typebot/api/getPublishedTypebot.ts b/apps/builder/src/features/typebot/api/getPublishedTypebot.ts
@@ -4,8 +4,6 @@ import { TRPCError } from '@trpc/server'
 import { publicTypebotSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 import { isReadTypebotForbidden } from '../helpers/isReadTypebotForbidden'
-import { parseInvalidTypebot } from '../helpers/parseInvalidTypebot'
-import { PublicTypebot } from '@typebot.io/schemas'
 
 export const getPublishedTypebot = authenticatedProcedure
   .meta({
@@ -50,7 +48,7 @@ export const getPublishedTypebot = authenticatedProcedure
 
     try {
       const parsedTypebot = publicTypebotSchema.parse(
-        parseInvalidTypebot(existingTypebot.publishedTypebot as PublicTypebot)
+        existingTypebot.publishedTypebot
       )
 
       return {

diff --git a/apps/builder/src/features/typebot/api/getTypebot.ts b/apps/builder/src/features/typebot/api/getTypebot.ts
@@ -4,10 +4,7 @@ import { TRPCError } from '@trpc/server'
 import { Typebot, typebotSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 import { isReadTypebotForbidden } from '../helpers/isReadTypebotForbidden'
-import { omit } from '@typebot.io/lib'
-import { Typebot as TypebotFromDb } from '@typebot.io/prisma'
 import { migrateTypebotFromV3ToV4 } from '@typebot.io/lib/migrations/migrateTypebotFromV3ToV4'
-import { parseInvalidTypebot } from '../helpers/parseInvalidTypebot'
 
 export const getTypebot = authenticatedProcedure
   .meta({
@@ -46,8 +43,8 @@ export const getTypebot = authenticatedProcedure
       throw new TRPCError({ code: 'NOT_FOUND', message: 'Typebot not found' })
 
     try {
-      const parsedTypebot = await parseTypebot(
-        omit(existingTypebot, 'collaborators')
+      const parsedTypebot = await migrateTypebot(
+        typebotSchema.parse(existingTypebot)
       )
 
       return {
@@ -66,10 +63,7 @@ export const getTypebot = authenticatedProcedure
     }
   })
 
-const parseTypebot = async (typebot: TypebotFromDb): Promise<Typebot> => {
-  const parsedTypebot = typebotSchema.parse(
-    typebot.version !== '5' ? parseInvalidTypebot(typebot as Typebot) : typebot
-  )
-  if (['4', '5'].includes(parsedTypebot.version ?? '')) return parsedTypebot
-  return migrateTypebotFromV3ToV4(prisma)(parsedTypebot)
+const migrateTypebot = async (typebot: Typebot): Promise<Typebot> => {
+  if (['4', '5'].includes(typebot.version ?? '')) return typebot
+  return migrateTypebotFromV3ToV4(prisma)(typebot)
 }
diff --git a/apps/builder/src/features/typebot/api/listTypebots.ts b/apps/builder/src/features/typebot/api/listTypebots.ts
@@ -21,7 +21,7 @@ export const listTypebots = authenticatedProcedure
   .output(
     z.object({
       typebots: z.array(
-        typebotSchema
+        typebotSchema._def.schema
           .pick({
             name: true,
             icon: true,

diff --git a/apps/builder/src/features/typebot/api/publishTypebot.ts b/apps/builder/src/features/typebot/api/publishTypebot.ts
@@ -49,31 +49,43 @@ export const publishTypebot = authenticatedProcedure
         },
         data: {
           version: existingTypebot.version,
-          edges: typebotSchema.shape.edges.parse(existingTypebot.edges),
-          groups: typebotSchema.shape.groups.parse(existingTypebot.groups),
-          settings: typebotSchema.shape.settings.parse(
+          edges: typebotSchema._def.schema.shape.edges.parse(
+            existingTypebot.edges
+          ),
+          groups: typebotSchema._def.schema.shape.groups.parse(
+            existingTypebot.groups
+          ),
+          settings: typebotSchema._def.schema.shape.settings.parse(
             existingTypebot.settings
           ),
-          variables: typebotSchema.shape.variables.parse(
+          variables: typebotSchema._def.schema.shape.variables.parse(
             existingTypebot.variables
           ),
-          theme: typebotSchema.shape.theme.parse(existingTypebot.theme),
+          theme: typebotSchema._def.schema.shape.theme.parse(
+            existingTypebot.theme
+          ),
         },
       })
     else
       await prisma.publicTypebot.createMany({
         data: {
           version: existingTypebot.version,
           typebotId: existingTypebot.id,
-          edges: typebotSchema.shape.edges.parse(existingTypebot.edges),
-          groups: typebotSchema.shape.groups.parse(existingTypebot.groups),
-          settings: typebotSchema.shape.settings.parse(
+          edges: typebotSchema._def.schema.shape.edges.parse(
+            existingTypebot.edges
+          ),
+          groups: typebotSchema._def.schema.shape.groups.parse(
+            existingTypebot.groups
+          ),
+          settings: typebotSchema._def.schema.shape.settings.parse(
             existingTypebot.settings
           ),
-          variables: typebotSchema.shape.variables.parse(
+          variables: typebotSchema._def.schema.shape.variables.parse(
             existingTypebot.variables
           ),
-          theme: typebotSchema.shape.theme.parse(existingTypebot.theme),
+          theme: typebotSchema._def.schema.shape.theme.parse(
+            existingTypebot.theme
+          ),
         },
       })
 

diff --git a/apps/builder/src/features/typebot/api/updateTypebot.ts b/apps/builder/src/features/typebot/api/updateTypebot.ts
@@ -27,7 +27,7 @@ export const updateTypebot = authenticatedProcedure
     z.object({
       typebotId: z.string(),
       typebot: typebotCreateSchema.merge(
-        typebotSchema
+        typebotSchema._def.schema
           .pick({
             isClosed: true,
           })

diff --git a/apps/builder/src/features/typebot/helpers/parseInvalidTypebot.ts b/apps/builder/src/features/typebot/helpers/parseInvalidTypebot.ts
diff --git a/apps/builder/src/pages/api/customDomains.ts b/apps/builder/src/pages/api/customDomains.ts