♻️ (viewer) Remove barrel exports and flatten folder arch

apps/viewer/src/features/blocks/integrations/googleSheets/api/index.ts

@@ -1 +0,0 @@
-export * from './utils'

apps/viewer/src/features/blocks/integrations/googleSheets/api/utils/index.ts

@@ -1 +0,0 @@
-export * from './executeGoogleSheetBlock'

apps/viewer/src/features/blocks/integrations/googleSheets/executeGoogleSheetBlock.ts

@@ -1,12 +1,12 @@
-import { ExecuteIntegrationResponse } from '@/features/chat'
 import {
   GoogleSheetsBlock,
   GoogleSheetsAction,
   SessionState,
 } from '@typebot.io/schemas'
-import { getRow } from './getRow'
 import { insertRow } from './insertRow'
 import { updateRow } from './updateRow'
+import { getRow } from './getRow'
+import { ExecuteIntegrationResponse } from '@/features/chat/types'
 
 export const executeGoogleSheetBlock = async (
   state: SessionState,

apps/viewer/src/features/blocks/integrations/googleSheets/getRow.ts

@@ -6,12 +6,13 @@ import {
   LogicalOperator,
   ReplyLog,
 } from '@typebot.io/schemas'
-import { saveErrorLog } from '@/features/logs/api'
-import { getAuthenticatedGoogleDoc } from './helpers'
-import { deepParseVariable, updateVariables } from '@/features/variables'
 import { isNotEmpty, byId, isDefined } from '@typebot.io/lib'
-import { ExecuteIntegrationResponse } from '@/features/chat'
 import type { GoogleSpreadsheetRow } from 'google-spreadsheet'
+import { getAuthenticatedGoogleDoc } from './helpers/getAuthenticatedGoogleDoc'
+import { ExecuteIntegrationResponse } from '@/features/chat/types'
+import { saveErrorLog } from '@/features/logs/saveErrorLog'
+import { updateVariables } from '@/features/variables/updateVariables'
+import { deepParseVariables } from '@/features/variables/deepParseVariable'
 
 export const getRow = async (
   state: SessionState,
@@ -20,7 +21,7 @@ export const getRow = async (
     options,
   }: { outgoingEdgeId?: string; options: GoogleSheetsGetOptions }
 ): Promise<ExecuteIntegrationResponse> => {
-  const { sheetId, cellsToExtract, referenceCell, filter } = deepParseVariable(
+  const { sheetId, cellsToExtract, referenceCell, filter } = deepParseVariables(
     state.typebot.variables
   )(options)
   if (!sheetId) return { outgoingEdgeId }

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

@@ -1,20 +1,6 @@
-import { parseVariables } from '@/features/variables'
 import { getAuthenticatedGoogleClient } from '@/lib/google-sheets'
 import { TRPCError } from '@trpc/server'
 import { GoogleSpreadsheet } from 'google-spreadsheet'
-import { Variable, Cell } from '@typebot.io/schemas'
-
-export const parseCellValues =
-  (variables: Variable[]) =>
-  (cells: Cell[]): { [key: string]: string } =>
-    cells.reduce((row, cell) => {
-      return !cell.column || !cell.value
-        ? row
-        : {
-            ...row,
-            [cell.column]: parseVariables(variables)(cell.value),
-          }
-    }, {})
 
 export const getAuthenticatedGoogleDoc = async ({
   credentialsId,

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

@@ -0,0 +1,14 @@
+import { parseVariables } from '@/features/variables/parseVariables'
+import { Variable, Cell } from '@typebot.io/schemas'
+
+export const parseCellValues =
+  (variables: Variable[]) =>
+  (cells: Cell[]): { [key: string]: string } =>
+    cells.reduce((row, cell) => {
+      return !cell.column || !cell.value
+        ? row
+        : {
+            ...row,
+            [cell.column]: parseVariables(variables)(cell.value),
+          }
+    }, {})

apps/viewer/src/features/blocks/integrations/googleSheets/insertRow.ts

@@ -3,9 +3,11 @@ import {
   GoogleSheetsInsertRowOptions,
   ReplyLog,
 } from '@typebot.io/schemas'
-import { saveErrorLog, saveSuccessLog } from '@/features/logs/api'
-import { getAuthenticatedGoogleDoc, parseCellValues } from './helpers'
-import { ExecuteIntegrationResponse } from '@/features/chat'
+import { parseCellValues } from './helpers/parseCellValues'
+import { getAuthenticatedGoogleDoc } from './helpers/getAuthenticatedGoogleDoc'
+import { ExecuteIntegrationResponse } from '@/features/chat/types'
+import { saveErrorLog } from '@/features/logs/saveErrorLog'
+import { saveSuccessLog } from '@/features/logs/saveSuccessLog'
 
 export const insertRow = async (
   { result, typebot: { variables } }: SessionState,

apps/viewer/src/features/blocks/integrations/googleSheets/updateRow.ts

@@ -3,11 +3,13 @@ import {
   GoogleSheetsUpdateRowOptions,
   ReplyLog,
 } from '@typebot.io/schemas'
-import { saveErrorLog, saveSuccessLog } from '@/features/logs/api'
-import { getAuthenticatedGoogleDoc, parseCellValues } from './helpers'
 import { TRPCError } from '@trpc/server'
-import { deepParseVariable } from '@/features/variables'
-import { ExecuteIntegrationResponse } from '@/features/chat'
+import { parseCellValues } from './helpers/parseCellValues'
+import { getAuthenticatedGoogleDoc } from './helpers/getAuthenticatedGoogleDoc'
+import { deepParseVariables } from '@/features/variables/deepParseVariable'
+import { ExecuteIntegrationResponse } from '@/features/chat/types'
+import { saveErrorLog } from '@/features/logs/saveErrorLog'
+import { saveSuccessLog } from '@/features/logs/saveSuccessLog'
 
 export const updateRow = async (
   { result, typebot: { variables } }: SessionState,
@@ -16,7 +18,7 @@ export const updateRow = async (
     options,
   }: { outgoingEdgeId?: string; options: GoogleSheetsUpdateRowOptions }
 ): Promise<ExecuteIntegrationResponse> => {
-  const { sheetId, referenceCell } = deepParseVariable(variables)(options)
+  const { sheetId, referenceCell } = deepParseVariables(variables)(options)
   if (!options.cellsToUpsert || !sheetId || !referenceCell)
     return { outgoingEdgeId }