♻️ Introduce typebot v6 with events (#1013)

Closes #885

packages/bot-engine/blocks/integrations/googleSheets/executeGoogleSheetBlock.ts

@@ -1,17 +1,15 @@
-import {
-  GoogleSheetsBlock,
-  GoogleSheetsAction,
-  SessionState,
-} from '@typebot.io/schemas'
+import { GoogleSheetsBlock, SessionState } from '@typebot.io/schemas'
 import { insertRow } from './insertRow'
 import { updateRow } from './updateRow'
 import { getRow } from './getRow'
 import { ExecuteIntegrationResponse } from '../../../types'
+import { GoogleSheetsAction } from '@typebot.io/schemas/features/blocks/integrations/googleSheets/constants'
 
 export const executeGoogleSheetBlock = async (
   state: SessionState,
   block: GoogleSheetsBlock
 ): Promise<ExecuteIntegrationResponse> => {
+  if (!block.options) return { outgoingEdgeId: block.outgoingEdgeId }
   const action = block.options.action
   if (!action) return { outgoingEdgeId: block.outgoingEdgeId }
   switch (action) {

packages/bot-engine/blocks/integrations/googleSheets/getRow.ts

@@ -4,7 +4,7 @@ import {
   VariableWithValue,
   ReplyLog,
 } from '@typebot.io/schemas'
-import { isNotEmpty, byId } from '@typebot.io/lib'
+import { isNotEmpty, byId, isDefined } from '@typebot.io/lib'
 import { getAuthenticatedGoogleDoc } from './helpers/getAuthenticatedGoogleDoc'
 import { ExecuteIntegrationResponse } from '../../../types'
 import { matchFilter } from './helpers/matchFilter'
@@ -20,7 +20,7 @@ export const getRow = async (
 ): Promise<ExecuteIntegrationResponse> => {
   const logs: ReplyLog[] = []
   const { variables } = state.typebotsQueue[0].typebot
-  const { sheetId, cellsToExtract, referenceCell, filter } =
+  const { sheetId, cellsToExtract, filter, ...parsedOptions } =
     deepParseVariables(variables)(options)
   if (!sheetId) return { outgoingEdgeId }
 
@@ -36,8 +36,9 @@ export const getRow = async (
     const filteredRows = getTotalRows(
       options.totalRowsToExtract,
       rows.filter((row) =>
-        referenceCell
-          ? row.get(referenceCell.column as string) === referenceCell.value
+        'referenceCell' in parsedOptions && parsedOptions.referenceCell
+          ? row.get(parsedOptions.referenceCell?.column as string) ===
+            parsedOptions.referenceCell?.value
           : matchFilter(row, filter)
       )
     )
@@ -50,17 +51,19 @@ export const getRow = async (
       return { outgoingEdgeId, logs }
     }
     const extractingColumns = cellsToExtract
-      .map((cell) => cell.column)
+      ?.map((cell) => cell.column)
       .filter(isNotEmpty)
-    const selectedRows = filteredRows.map((row) =>
-      extractingColumns.reduce<{ [key: string]: string }>(
-        (obj, column) => ({ ...obj, [column]: row.get(column) }),
-        {}
+    const selectedRows = filteredRows
+      .map((row) =>
+        extractingColumns?.reduce<{ [key: string]: string }>(
+          (obj, column) => ({ ...obj, [column]: row.get(column) }),
+          {}
+        )
       )
-    )
+      .filter(isDefined)
     if (!selectedRows) return { outgoingEdgeId }
 
-    const newVariables = options.cellsToExtract.reduce<VariableWithValue[]>(
+    const newVariables = options.cellsToExtract?.reduce<VariableWithValue[]>(
       (newVariables, cell) => {
         const existingVariable = variables.find(byId(cell.variableId))
         const value = selectedRows.map((row) => row[cell.column ?? ''])
@@ -75,6 +78,7 @@ export const getRow = async (
       },
       []
     )
+    if (!newVariables) return { outgoingEdgeId }
     const newSessionState = updateVariablesInSession(state)(newVariables)
     return {
       outgoingEdgeId,

packages/bot-engine/blocks/integrations/googleSheets/helpers/getAuthenticatedGoogleDoc.ts

@@ -3,11 +3,11 @@ import { env } from '@typebot.io/env'
 import { encrypt } from '@typebot.io/lib/api/encryption/encrypt'
 import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
 import { isDefined } from '@typebot.io/lib/utils'
-import { GoogleSheetsCredentials } from '@typebot.io/schemas/features/blocks/integrations/googleSheets/schemas'
 import { Credentials as CredentialsFromDb } from '@typebot.io/prisma'
 import { GoogleSpreadsheet } from 'google-spreadsheet'
 import { OAuth2Client, Credentials } from 'google-auth-library'
 import prisma from '@typebot.io/lib/prisma'
+import { GoogleSheetsCredentials } from '@typebot.io/schemas'
 
 export const getAuthenticatedGoogleDoc = async ({
   credentialsId,

packages/bot-engine/blocks/integrations/googleSheets/helpers/matchFilter.ts

@@ -1,9 +1,9 @@
 import { isDefined } from '@typebot.io/lib'
+import { GoogleSheetsGetOptions } from '@typebot.io/schemas'
 import {
-  GoogleSheetsGetOptions,
   LogicalOperator,
   ComparisonOperators,
-} from '@typebot.io/schemas'
+} from '@typebot.io/schemas/features/blocks/logic/condition/constants'
 import { GoogleSpreadsheetRow } from 'google-spreadsheet'
 
 export const matchFilter = (
@@ -12,7 +12,7 @@ export const matchFilter = (
 ) => {
   if (!filter) return true
   return filter.logicalOperator === LogicalOperator.AND
-    ? filter.comparisons.every(
+    ? filter.comparisons?.every(
         (comparison) =>
           comparison.column &&
           matchComparison(
@@ -21,7 +21,7 @@ export const matchFilter = (
             comparison.value
           )
       )
-    : filter.comparisons.some(
+    : filter.comparisons?.some(
         (comparison) =>
           comparison.column &&
           matchComparison(

packages/bot-engine/blocks/integrations/googleSheets/updateRow.ts

@@ -17,8 +17,14 @@ export const updateRow = async (
   }: { outgoingEdgeId?: string; options: GoogleSheetsUpdateRowOptions }
 ): Promise<ExecuteIntegrationResponse> => {
   const { variables } = state.typebotsQueue[0].typebot
-  const { sheetId, referenceCell, filter } =
+  const { sheetId, filter, ...parsedOptions } =
     deepParseVariables(variables)(options)
+
+  const referenceCell =
+    'referenceCell' in parsedOptions && parsedOptions.referenceCell
+      ? parsedOptions.referenceCell
+      : null
+
   if (!options.cellsToUpsert || !sheetId || (!referenceCell && !filter))
     return { outgoingEdgeId }