♻️ (models) Change to features-centric folder structure

packages/bot-engine/src/features/chatwoot/utils/openChatwootWidget.ts

@@ -1,4 +1,4 @@
-import { ChatwootBlock, ChatwootOptions } from 'models/features/chatwoot'
+import { ChatwootBlock, ChatwootOptions } from 'models'
 import { sendEventToParent } from 'services/chat'
 import { IntegrationContext } from 'services/integration'
 import { isEmbedded } from 'services/utils'

packages/models/features/chatwoot/index.ts

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

packages/models/index.ts

@@ -1,8 +0,0 @@
-export * from './typebot'
-export * from './publicTypebot'
-export * from './result'
-export * from './answer'
-export * from './utils'
-export * from './credentials'
-export * from './webhooks'
-export * from './features/chatwoot'

packages/models/package.json

@@ -1,8 +1,8 @@
 {
   "name": "models",
   "version": "1.0.0",
-  "main": "./index.ts",
+  "main": "./src/index.ts",
-  "types": "./index.ts",
+  "types": "./src/index.ts",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "dependencies": {

packages/models/src/features/blocks/blocks.ts

@@ -4,17 +4,17 @@ import {
   Item,
   LogicBlockOptions,
 } from '.'
-import { BubbleBlock, bubbleBlockSchema } from './bubble'
+import { BubbleBlock, bubbleBlockSchema } from './bubbles'
-import { InputBlock, inputBlockSchema } from './input'
+import { InputBlock, inputBlockSchema } from './inputs'
-import { IntegrationBlock, integrationBlockSchema } from './integration'
+import { IntegrationBlock, integrationBlockSchema } from './integrations'
 import { ConditionBlock, LogicBlock, logicBlockSchema } from './logic'
 import { z } from 'zod'
 import {
   BubbleBlockType,
   InputBlockType,
-  IntegrationBlockType,
   LogicBlockType,
   blockBaseSchema,
+  IntegrationBlockType,
 } from './shared'
 
 export type DraggableBlock =

packages/models/src/features/blocks/bubbles/index.ts

@@ -1,4 +1,4 @@
-export * from './bubble'
+export * from './bubbleBlock'
 export * from './text'
 export * from './image'
 export * from './video'

packages/models/src/features/blocks/index.ts

@@ -1,7 +1,7 @@
 export * from './blocks'
-export * from './bubble'
+export * from './bubbles'
-export * from './input'
+export * from './inputs'
 export * from './logic'
-export * from './integration'
+export * from './integrations'
 export * from './item'
 export * from './shared'

packages/models/src/features/blocks/inputs/index.ts

@@ -1,4 +1,4 @@
-export * from './input'
+export * from './inputBlock'
 export * from './text'
 export * from './email'
 export * from './number'

packages/models/src/features/blocks/integrations/chatwoot.ts

@@ -1,8 +1,5 @@
 import { z } from 'zod'
-import {
+import { blockBaseSchema, IntegrationBlockType } from '../shared'
-  blockBaseSchema,
-  IntegrationBlockType,
-} from '../../typebot/blocks/shared'
 
 export const chatwootOptionsSchema = z.object({
   baseUrl: z.string(),

packages/models/src/features/blocks/integrations/googleAnalytics.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { IntegrationBlockType, blockBaseSchema } from '../shared'
+import { blockBaseSchema, IntegrationBlockType } from '../shared'
 
 export const googleAnalyticsOptionsSchema = z.object({
   trackingId: z.string().optional(),

packages/models/src/features/blocks/integrations/googleSheets.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { IntegrationBlockType, blockBaseSchema } from '../shared'
+import { blockBaseSchema, IntegrationBlockType } from '../shared'
 
 export enum GoogleSheetsAction {
   GET = 'Get data from sheet',

packages/models/src/features/blocks/integrations/index.ts

@@ -1,4 +1,4 @@
-export * from './integration'
+export * from './integrationBlock'
 export * from './webhook'
 export * from './googleAnalytics'
 export * from './pabblyConnect'
@@ -6,3 +6,4 @@ export * from './makeCom'
 export * from './zapier'
 export * from './sendEmail'
 export * from './googleSheets'
+export * from './chatwoot'

packages/models/src/features/blocks/integrations/integrationBlock.ts

@@ -1,8 +1,5 @@
 import { z } from 'zod'
-import {
+import { chatwootBlockSchema, chatwootOptionsSchema } from './chatwoot'
-  chatwootBlockSchema,
-  chatwootOptionsSchema,
-} from '../../../features/chatwoot'
 import {
   googleAnalyticsOptionsSchema,
   googleAnalyticsBlockSchema,

packages/models/src/features/blocks/integrations/makeCom.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { IntegrationBlockType, blockBaseSchema } from '../shared'
+import { blockBaseSchema, IntegrationBlockType } from '../shared'
 import { webhookOptionsSchema } from './webhook'
 
 export const makeComBlockSchema = blockBaseSchema.and(

packages/models/src/features/blocks/integrations/pabblyConnect.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { IntegrationBlockType, blockBaseSchema } from '../shared'
+import { blockBaseSchema, IntegrationBlockType } from '../shared'
 import { webhookOptionsSchema } from './webhook'
 
 export const pabblyConnectBlockSchema = blockBaseSchema.and(

packages/models/src/features/blocks/integrations/sendEmail.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { IntegrationBlockType, blockBaseSchema } from '../shared'
+import { blockBaseSchema, IntegrationBlockType } from '../shared'
 
 export const sendEmailOptionsSchema = z.object({
   credentialsId: z.string(),

packages/models/src/features/blocks/integrations/webhook.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { IntegrationBlockType, blockBaseSchema } from '../shared'
+import { blockBaseSchema, IntegrationBlockType } from '../shared'
 
 const variableForTestSchema = z.object({
   id: z.string(),

packages/models/src/features/blocks/integrations/zapier.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { IntegrationBlockType, blockBaseSchema } from '../shared'
+import { blockBaseSchema, IntegrationBlockType } from '../shared'
 import { webhookOptionsSchema } from './webhook'
 
 export const zapierBlockSchema = blockBaseSchema.and(

packages/models/src/features/blocks/item.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import { itemBaseSchema } from './shared'
-import { buttonItemSchema } from './input'
+import { buttonItemSchema } from './inputs'
 import { conditionItemSchema } from './logic'
 
 export type ItemIndices = {

packages/models/src/features/blocks/logic/index.ts

@@ -1,4 +1,4 @@
-export * from './logic'
+export * from './logicBlock'
 export * from './code'
 export * from './condition'
 export * from './redirect'

packages/models/src/features/result.ts

@@ -1,6 +1,7 @@
 import { Result as ResultFromPrisma } from 'db'
-import { Answer, VariableWithValue } from '.'
+import { Answer } from './answer'
-import { InputBlockType } from './typebot/blocks/shared'
+import { InputBlockType } from './blocks'
+import { VariableWithValue } from './typebot/variable'
 
 export type Result = Omit<ResultFromPrisma, 'createdAt' | 'variables'> & {
   createdAt: string

packages/models/src/features/typebot/index.ts

@@ -1,5 +1,4 @@
 export * from './typebot'
-export * from './blocks'
 export * from './theme'
 export * from './settings'
 export * from './variable'

packages/models/src/features/typebot/typebot.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import { settingsSchema } from './settings'
-import { blockSchema } from './blocks'
+import { blockSchema } from '../blocks'
 import { themeSchema } from './theme'
 import { variableSchema } from './variable'
 

packages/models/src/index.ts

@@ -0,0 +1,8 @@
+export * from './features/blocks'
+export * from './features/typebot'
+export * from './features/publicTypebot'
+export * from './features/result'
+export * from './features/answer'
+export * from './features/utils'
+export * from './features/credentials'
+export * from './features/webhooks'