♻️ (builder) Remove barrel export and flatten folder arch

apps/builder/src/features/workspace/WorkspaceProvider.tsx

@@ -8,13 +8,14 @@ import {
 } from 'react'
 import { byId } from '@typebot.io/lib'
 import { WorkspaceRole } from '@typebot.io/prisma'
-import { useUser } from '../account/UserProvider'
 import { useRouter } from 'next/router'
 import { trpc } from '@/lib/trpc'
 import { Workspace } from '@typebot.io/schemas'
 import { useToast } from '@/hooks/useToast'
-import { parseNewName, setWorkspaceIdInLocalStorage } from './utils'
-import { useTypebot } from '../editor'
+import { useUser } from '../account/hooks/useUser'
+import { useTypebot } from '../editor/providers/TypebotProvider'
+import { setWorkspaceIdInLocalStorage } from './helpers/setWorkspaceIdInLocalStorage'
+import { parseNewName } from './helpers/parseNewName'
 
 const workspaceContext = createContext<{
   workspaces: Pick<Workspace, 'id' | 'name' | 'icon' | 'plan'>[]

apps/builder/src/features/workspace/api/createWorkspace.ts

@@ -1,12 +1,12 @@
 import { sendTelemetryEvents } from '@typebot.io/lib/telemetry/sendTelemetryEvent'
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Workspace, workspaceSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
-import { parseWorkspaceDefaultPlan } from '../../utils'
+import { parseWorkspaceDefaultPlan } from '../helpers/parseWorkspaceDefaultPlan'
 
-export const createWorkspaceProcedure = authenticatedProcedure
+export const createWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'POST',

apps/builder/src/features/workspace/api/deleteWorkspace.ts

@@ -1,8 +1,8 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { z } from 'zod'
 
-export const deleteWorkspaceProcedure = authenticatedProcedure
+export const deleteWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'DELETE',

apps/builder/src/features/workspace/api/getWorkspace.ts

@@ -1,10 +1,10 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Workspace, workspaceSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 
-export const getWorkspaceProcedure = authenticatedProcedure
+export const getWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',

apps/builder/src/features/workspace/api/index.ts

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

apps/builder/src/features/workspace/api/listInvitationsInWorkspace.ts

@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import {
   WorkspaceInvitation,
@@ -7,7 +7,7 @@ import {
 } from '@typebot.io/schemas'
 import { z } from 'zod'
 
-export const listInvitationsInWorkspaceProcedure = authenticatedProcedure
+export const listInvitationsInWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',

apps/builder/src/features/workspace/api/listMembersInWorkspace.ts

@@ -1,10 +1,10 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { WorkspaceMember, workspaceMemberSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 
-export const listMembersInWorkspaceProcedure = authenticatedProcedure
+export const listMembersInWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',

apps/builder/src/features/workspace/api/listWorkspaces.ts

@@ -1,10 +1,10 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Workspace, workspaceSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 
-export const listWorkspacesProcedure = authenticatedProcedure
+export const listWorkspaces = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',

apps/builder/src/features/workspace/api/procedures/index.ts

@@ -1,7 +0,0 @@
-export * from './createWorkspaceProcedure'
-export * from './deleteWorkspaceProcedure'
-export * from './getWorkspaceProcedure'
-export * from './listInvitationsInWorkspaceProcedure'
-export * from './listMembersInWorkspaceProcedure'
-export * from './listWorkspacesProcedure'
-export * from './updateWorkspaceProcedure'

apps/builder/src/features/workspace/api/router.ts

@@ -1,18 +1,16 @@
-import { router } from '@/utils/server/trpc'
-import {
-  createWorkspaceProcedure,
-  deleteWorkspaceProcedure,
-  getWorkspaceProcedure,
-  listMembersInWorkspaceProcedure,
-  listWorkspacesProcedure,
-  updateWorkspaceProcedure,
-} from './procedures'
+import { router } from '@/helpers/server/trpc'
+import { createWorkspace } from './createWorkspace'
+import { deleteWorkspace } from './deleteWorkspace'
+import { getWorkspace } from './getWorkspace'
+import { listMembersInWorkspace } from './listMembersInWorkspace'
+import { listWorkspaces } from './listWorkspaces'
+import { updateWorkspace } from './updateWorkspace'
 
 export const workspaceRouter = router({
-  listWorkspaces: listWorkspacesProcedure,
-  getWorkspace: getWorkspaceProcedure,
-  listMembersInWorkspace: listMembersInWorkspaceProcedure,
-  createWorkspace: createWorkspaceProcedure,
-  updateWorkspace: updateWorkspaceProcedure,
-  deleteWorkspace: deleteWorkspaceProcedure,
+  listWorkspaces,
+  getWorkspace,
+  listMembersInWorkspace,
+  createWorkspace,
+  updateWorkspace,
+  deleteWorkspace,
 })

apps/builder/src/features/workspace/api/updateWorkspace.ts

@@ -1,10 +1,10 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Workspace, workspaceSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 
-export const updateWorkspaceProcedure = authenticatedProcedure
+export const updateWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'PATCH',

apps/builder/src/features/workspace/components/AddMemberForm.tsx

@@ -11,8 +11,8 @@ import {
 import { ChevronLeftIcon } from '@/components/icons'
 import { WorkspaceInvitation, WorkspaceRole } from '@typebot.io/prisma'
 import { FormEvent, useState } from 'react'
-import { Member } from '../../types'
-import { sendInvitationQuery } from '../../queries/sendInvitationQuery'
+import { Member } from '../types'
+import { sendInvitationQuery } from '../queries/sendInvitationQuery'
 
 type Props = {
   workspaceId: string

apps/builder/src/features/workspace/components/MembersList.tsx

@@ -11,15 +11,15 @@ import React from 'react'
 import { getSeatsLimit, isSeatsLimitReached } from '@typebot.io/lib/pricing'
 import { AddMemberForm } from './AddMemberForm'
 import { MemberItem } from './MemberItem'
-import { useUser } from '@/features/account'
-import { useWorkspace } from '../../WorkspaceProvider'
-import { useMembers } from '../../hooks/useMembers'
-import { deleteMemberQuery } from '../../queries/deleteMemberQuery'
-import { updateMemberQuery } from '../../queries/updateMemberQuery'
-import { deleteInvitationQuery } from '../../queries/deleteInvitationQuery'
-import { updateInvitationQuery } from '../../queries/updateInvitationQuery'
-import { Member } from '../../types'
 import { isDefined } from '@typebot.io/lib'
+import { useUser } from '@/features/account/hooks/useUser'
+import { useMembers } from '../hooks/useMembers'
+import { deleteInvitationQuery } from '../queries/deleteInvitationQuery'
+import { deleteMemberQuery } from '../queries/deleteMemberQuery'
+import { updateInvitationQuery } from '../queries/updateInvitationQuery'
+import { updateMemberQuery } from '../queries/updateMemberQuery'
+import { Member } from '../types'
+import { useWorkspace } from '../WorkspaceProvider'
 
 export const MembersList = () => {
   const { user } = useUser()

apps/builder/src/features/workspace/components/MembersList/index.ts

@@ -1 +0,0 @@
-export { MembersList } from './MembersList'

apps/builder/src/features/workspace/components/WorkspaceDropdown.tsx

@@ -5,7 +5,7 @@ import {
   PlusIcon,
   LogOutIcon,
 } from '@/components/icons'
-import { PlanTag } from '@/features/billing'
+import { PlanTag } from '@/features/billing/components/PlanTag'
 import { trpc } from '@/lib/trpc'
 import {
   Menu,

apps/builder/src/features/workspace/components/WorkspaceSettingsModal.tsx

@@ -20,9 +20,10 @@ import { useState } from 'react'
 import { MembersList } from './MembersList'
 import { WorkspaceSettingsForm } from './WorkspaceSettingsForm'
 import { useWorkspace } from '../WorkspaceProvider'
-import { MyAccountForm, UserPreferencesForm } from '@/features/account'
-import { BillingContent } from '@/features/billing'
 import packageJson from '../../../../../../package.json'
+import { UserPreferencesForm } from '@/features/account/components/UserPreferencesForm'
+import { MyAccountForm } from '@/features/account/components/MyAccountForm'
+import { BillingSettingsLayout } from '@/features/billing/components/BillingSettingsLayout'
 
 type Props = {
   isOpen: boolean
@@ -175,7 +176,7 @@ const SettingsContent = ({
     case 'members':
       return <MembersList />
     case 'billing':
-      return <BillingContent />
+      return <BillingSettingsLayout />
     default:
       return null
   }

apps/builder/src/features/workspace/components/index.tsx

@@ -1,2 +0,0 @@
-export * from './WorkspaceSettingsModal'
-export * from './WorkspaceDropdown'

apps/builder/src/features/workspace/hooks/useMembers.ts

@@ -1,5 +1,5 @@
 import { WorkspaceInvitation } from '@typebot.io/prisma'
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import useSWR from 'swr'
 import { env } from '@typebot.io/lib'
 import { Member } from '../types'

apps/builder/src/features/workspace/index.ts

@@ -1,3 +0,0 @@
-export { WorkspaceProvider, useWorkspace } from './WorkspaceProvider'
-export * from './components'
-export { parseWorkspaceDefaultPlan } from './utils'

apps/builder/src/features/workspace/utils/index.ts

@@ -1,3 +0,0 @@
-export * from './parseNewName'
-export * from './parseWorkspaceDefaultPlan'
-export * from './setWorkspaceIdInLocalStorage'