♻️ Introduce typebot v6 with events (#1013)

Closes #885

packages/schemas/features/blocks/integrations/googleSheets/constants.ts

@@ -0,0 +1,16 @@
+export enum GoogleSheetsAction {
+  GET = 'Get data from sheet',
+  INSERT_ROW = 'Insert a row',
+  UPDATE_ROW = 'Update a row',
+}
+
+export const totalRowsToExtractOptions = [
+  'All',
+  'First',
+  'Last',
+  'Random',
+] as const
+
+export const defaultGoogleSheetsOptions = {
+  totalRowsToExtract: 'All',
+} as const

packages/schemas/features/blocks/integrations/googleSheets/enums.ts

@@ -1,5 +0,0 @@
-export enum GoogleSheetsAction {
-  GET = 'Get data from sheet',
-  INSERT_ROW = 'Insert a row',
-  UPDATE_ROW = 'Update a row',
-}

packages/schemas/features/blocks/integrations/googleSheets/index.ts

@@ -1,2 +1 @@
-export * from './enums'
-export * from './schemas'
+export * from './schema'

packages/schemas/features/blocks/integrations/googleSheets/schema.ts

@@ -0,0 +1,178 @@
+import { z } from 'zod'
+import { IntegrationBlockType } from '../constants'
+import { GoogleSheetsAction, totalRowsToExtractOptions } from './constants'
+import { blockBaseSchema, credentialsBaseSchema } from '../../shared'
+import {
+  ComparisonOperators,
+  LogicalOperator,
+} from '../../logic/condition/constants'
+
+const cellSchema = z.object({
+  column: z.string().optional(),
+  value: z.string().optional(),
+  id: z.string(),
+})
+
+const extractingCellSchema = z.object({
+  column: z.string().optional(),
+  id: z.string(),
+  variableId: z.string().optional(),
+})
+
+const googleSheetsOptionsBaseSchema = z.object({
+  credentialsId: z.string().optional(),
+  sheetId: z.string().optional(),
+  spreadsheetId: z.string().optional(),
+})
+
+const rowsFilterComparisonSchema = z.object({
+  id: z.string(),
+  column: z.string().optional(),
+  comparisonOperator: z.nativeEnum(ComparisonOperators).optional(),
+  value: z.string().optional(),
+})
+
+const initialGoogleSheetsOptionsSchema = googleSheetsOptionsBaseSchema.merge(
+  z.object({
+    action: z.undefined(),
+  })
+)
+
+const googleSheetsGetOptionsV5Schema = googleSheetsOptionsBaseSchema.merge(
+  z.object({
+    action: z.enum([GoogleSheetsAction.GET]),
+    referenceCell: cellSchema.optional().optional(),
+    filter: z
+      .object({
+        comparisons: z.array(rowsFilterComparisonSchema).optional(),
+        logicalOperator: z.nativeEnum(LogicalOperator).optional(),
+      })
+      .optional(),
+    cellsToExtract: z.array(extractingCellSchema).optional(),
+    totalRowsToExtract: z.enum(totalRowsToExtractOptions).optional(),
+  })
+)
+
+const googleSheetsGetOptionsSchemas = {
+  v5: googleSheetsGetOptionsV5Schema,
+  v6: googleSheetsGetOptionsV5Schema.omit({
+    referenceCell: true,
+  }),
+}
+
+const googleSheetsGetOptionsSchema = z.union([
+  googleSheetsGetOptionsSchemas.v5,
+  googleSheetsGetOptionsSchemas.v6,
+])
+
+const googleSheetsInsertRowOptionsSchema = googleSheetsOptionsBaseSchema.merge(
+  z.object({
+    action: z.enum([GoogleSheetsAction.INSERT_ROW]),
+    cellsToInsert: z.array(cellSchema).optional(),
+  })
+)
+
+const googleSheetsUpdateRowOptionsV5Schema =
+  googleSheetsOptionsBaseSchema.merge(
+    z.object({
+      action: z.enum([GoogleSheetsAction.UPDATE_ROW]),
+      cellsToUpsert: z.array(cellSchema).optional(),
+      referenceCell: cellSchema.optional(),
+      filter: z
+        .object({
+          comparisons: z.array(rowsFilterComparisonSchema).optional(),
+          logicalOperator: z.nativeEnum(LogicalOperator).optional(),
+        })
+        .optional(),
+    })
+  )
+
+const googleSheetsUpdateRowOptionsSchemas = {
+  v5: googleSheetsUpdateRowOptionsV5Schema,
+  v6: googleSheetsUpdateRowOptionsV5Schema.omit({
+    referenceCell: true,
+  }),
+}
+
+const googleSheetsUpdateRowOptionsSchema = z.union([
+  googleSheetsUpdateRowOptionsSchemas.v5,
+  googleSheetsUpdateRowOptionsSchemas.v6,
+])
+
+export const googleSheetsOptionsSchemas = {
+  v5: z.discriminatedUnion('action', [
+    googleSheetsGetOptionsSchemas.v5,
+    googleSheetsInsertRowOptionsSchema,
+    googleSheetsUpdateRowOptionsSchemas.v5,
+    initialGoogleSheetsOptionsSchema,
+  ]),
+  v6: z.discriminatedUnion('action', [
+    googleSheetsGetOptionsSchemas.v6,
+    googleSheetsInsertRowOptionsSchema,
+    googleSheetsUpdateRowOptionsSchemas.v6,
+    initialGoogleSheetsOptionsSchema,
+  ]),
+}
+
+export const googleSheetsBlockV5Schema = blockBaseSchema.merge(
+  z.object({
+    type: z.enum([IntegrationBlockType.GOOGLE_SHEETS]),
+    options: googleSheetsOptionsSchemas.v5.optional(),
+  })
+)
+
+export const googleSheetsBlockSchemas = {
+  v5: googleSheetsBlockV5Schema,
+  v6: googleSheetsBlockV5Schema.merge(
+    z.object({
+      options: googleSheetsOptionsSchemas.v6.optional(),
+    })
+  ),
+}
+
+export const googleSheetsBlockSchema = z.union([
+  googleSheetsBlockSchemas.v5,
+  googleSheetsBlockSchemas.v6,
+])
+
+export const googleSheetsCredentialsSchema = z
+  .object({
+    type: z.literal('google sheets'),
+    data: z.object({
+      refresh_token: z.string().nullish(),
+      expiry_date: z.number().nullish(),
+      access_token: z.string().nullish(),
+      token_type: z.string().nullish(),
+      id_token: z.string().nullish(),
+      scope: z.string().optional(),
+    }),
+  })
+  .merge(credentialsBaseSchema)
+
+export type GoogleSheetsBlock = z.infer<typeof googleSheetsBlockSchema>
+export type GoogleSheetsBlockV5 = z.infer<typeof googleSheetsBlockSchemas.v5>
+export type GoogleSheetsBlockV6 = z.infer<typeof googleSheetsBlockSchemas.v6>
+export type GoogleSheetsOptionsBase = z.infer<
+  typeof googleSheetsOptionsBaseSchema
+>
+export type GoogleSheetsGetOptions = z.infer<
+  typeof googleSheetsGetOptionsSchema
+>
+export type GoogleSheetsGetOptionsV6 = z.infer<
+  typeof googleSheetsGetOptionsSchemas.v6
+>
+export type GoogleSheetsInsertRowOptions = z.infer<
+  typeof googleSheetsInsertRowOptionsSchema
+>
+export type GoogleSheetsUpdateRowOptions = z.infer<
+  typeof googleSheetsUpdateRowOptionsSchema
+>
+export type GoogleSheetsUpdateRowOptionsV6 = z.infer<
+  typeof googleSheetsUpdateRowOptionsSchemas.v6
+>
+export type Cell = z.infer<typeof cellSchema>
+export type ExtractingCell = z.infer<typeof extractingCellSchema>
+export type RowsFilterComparison = z.infer<typeof rowsFilterComparisonSchema>
+export type GoogleSheetsCredentials = z.infer<
+  typeof googleSheetsCredentialsSchema
+>

packages/schemas/features/blocks/integrations/googleSheets/schemas.ts

@@ -1,167 +0,0 @@
-import { z } from 'zod'
-import { ComparisonOperators, LogicalOperator } from '../../logic/condition'
-import { IntegrationBlockType } from '../enums'
-import { GoogleSheetsAction } from './enums'
-import { blockBaseSchema, credentialsBaseSchema } from '../../baseSchemas'
-
-const cellSchema = z.object({
-  column: z.string().optional(),
-  value: z.string().optional(),
-  id: z.string(),
-})
-
-const extractingCellSchema = z.object({
-  column: z.string().optional(),
-  id: z.string(),
-  variableId: z.string().optional(),
-})
-
-const googleSheetsOptionsBaseSchema = z.object({
-  credentialsId: z.string().optional(),
-  sheetId: z.string().optional(),
-  spreadsheetId: z.string().optional(),
-})
-
-const rowsFilterComparisonSchema = z.object({
-  id: z.string(),
-  column: z.string().optional(),
-  comparisonOperator: z.nativeEnum(ComparisonOperators).optional(),
-  value: z.string().optional(),
-})
-
-const initialGoogleSheetsOptionsSchema = googleSheetsOptionsBaseSchema.merge(
-  z.object({
-    action: z.undefined(),
-  })
-)
-
-export const totalRowsToExtractOptions = [
-  'All',
-  'First',
-  'Last',
-  'Random',
-] as const
-
-const googleSheetsGetOptionsSchema = googleSheetsOptionsBaseSchema.merge(
-  z.object({
-    action: z.enum([GoogleSheetsAction.GET]),
-    referenceCell: cellSchema
-      .optional()
-      .describe('Deprecated. Use `filter` instead.'),
-    filter: z
-      .object({
-        comparisons: z.array(rowsFilterComparisonSchema),
-        logicalOperator: z.nativeEnum(LogicalOperator),
-      })
-      .optional(),
-    cellsToExtract: z.array(extractingCellSchema),
-    totalRowsToExtract: z.enum(totalRowsToExtractOptions).optional(),
-  })
-)
-
-const googleSheetsInsertRowOptionsSchema = googleSheetsOptionsBaseSchema.merge(
-  z.object({
-    action: z.enum([GoogleSheetsAction.INSERT_ROW]),
-    cellsToInsert: z.array(cellSchema),
-  })
-)
-
-const googleSheetsUpdateRowOptionsSchema = googleSheetsOptionsBaseSchema.merge(
-  z.object({
-    action: z.enum([GoogleSheetsAction.UPDATE_ROW]),
-    cellsToUpsert: z.array(cellSchema),
-    referenceCell: cellSchema
-      .optional()
-      .describe('Deprecated. Use `filter` instead.'),
-    filter: z
-      .object({
-        comparisons: z.array(rowsFilterComparisonSchema),
-        logicalOperator: z.nativeEnum(LogicalOperator),
-      })
-      .optional(),
-  })
-)
-
-export const googleSheetsOptionsSchema = z.discriminatedUnion('action', [
-  googleSheetsGetOptionsSchema,
-  googleSheetsInsertRowOptionsSchema,
-  googleSheetsUpdateRowOptionsSchema,
-  initialGoogleSheetsOptionsSchema,
-])
-
-export const googleSheetsBlockSchema = blockBaseSchema.merge(
-  z.object({
-    type: z.enum([IntegrationBlockType.GOOGLE_SHEETS]),
-    options: googleSheetsOptionsSchema,
-  })
-)
-
-export const googleSheetsCredentialsSchema = z
-  .object({
-    type: z.literal('google sheets'),
-    data: z.object({
-      refresh_token: z.string().nullish(),
-      expiry_date: z.number().nullish(),
-      access_token: z.string().nullish(),
-      token_type: z.string().nullish(),
-      id_token: z.string().nullish(),
-      scope: z.string().optional(),
-    }),
-  })
-  .merge(credentialsBaseSchema)
-
-export const defaultGoogleSheetsOptions: GoogleSheetsOptions = {}
-
-export const defaultGoogleSheetsGetOptions = (
-  createId: () => string
-): GoogleSheetsGetOptions => ({
-  action: GoogleSheetsAction.GET,
-  cellsToExtract: [
-    {
-      id: createId(),
-    },
-  ],
-})
-
-export const defaultGoogleSheetsInsertOptions = (
-  createId: () => string
-): GoogleSheetsInsertRowOptions => ({
-  action: GoogleSheetsAction.INSERT_ROW,
-  cellsToInsert: [
-    {
-      id: createId(),
-    },
-  ],
-})
-
-export const defaultGoogleSheetsUpdateOptions = (
-  createId: () => string
-): GoogleSheetsUpdateRowOptions => ({
-  action: GoogleSheetsAction.UPDATE_ROW,
-  cellsToUpsert: [
-    {
-      id: createId(),
-    },
-  ],
-})
-
-export type GoogleSheetsBlock = z.infer<typeof googleSheetsBlockSchema>
-export type GoogleSheetsOptions = z.infer<typeof googleSheetsOptionsSchema>
-export type GoogleSheetsOptionsBase = z.infer<
-  typeof googleSheetsOptionsBaseSchema
->
-export type GoogleSheetsGetOptions = z.infer<
-  typeof googleSheetsGetOptionsSchema
->
-export type GoogleSheetsInsertRowOptions = z.infer<
-  typeof googleSheetsInsertRowOptionsSchema
->
-export type GoogleSheetsUpdateRowOptions = z.infer<
-  typeof googleSheetsUpdateRowOptionsSchema
->
-export type Cell = z.infer<typeof cellSchema>
-export type ExtractingCell = z.infer<typeof extractingCellSchema>
-export type RowsFilterComparison = z.infer<typeof rowsFilterComparisonSchema>
-export type GoogleSheetsCredentials = z.infer<
-  typeof googleSheetsCredentialsSchema
->