Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
More folder restructure
Hakan Shehu267250b0b6fe
diff --git a/desktop/src/lib/accounts.ts b/desktop/src/lib/accounts.tsdeleted file mode 100644index 0f05513b..00000000--- a/desktop/src/lib/accounts.ts+++ /dev/null@@ -1,48 +0,0 @@-import { AppDatabaseSchema } from '@/main/schemas/app';-import { LoginOutput } from '@/types/accounts';-import { Server } from '@/types/servers';-import { CompiledQuery, Kysely } from 'kysely';--export const buildLoginMutationQueries = (- database: Kysely<AppDatabaseSchema>,- output: LoginOutput,- server: Server,-): CompiledQuery[] => {- const insertAccountQuery = database- .insertInto('accounts')- .values({- id: output.account.id,- name: output.account.name,- avatar: output.account.avatar,- device_id: output.account.deviceId,- email: output.account.email,- token: output.account.token,- server: server.domain,- })- .compile();-- const queries: CompiledQuery[] = [insertAccountQuery];-- if (output.workspaces.length > 0) {- const insertWorkspacesQuery = database- .insertInto('workspaces')- .values(- output.workspaces.map((workspace) => ({- id: workspace.id,- name: workspace.name,- account_id: output.account.id,- avatar: workspace.avatar,- role: workspace.role,- description: workspace.description,- synced: 0,- user_id: workspace.userId,- version_id: workspace.versionId,- })),- )- .compile();-- queries.push(insertWorkspacesQuery);- }-- return queries;-};diff --git a/desktop/src/lib/nodes.ts b/desktop/src/lib/nodes.tsindex 1be9de7f..94af6166 100644--- a/desktop/src/lib/nodes.ts+++ b/desktop/src/lib/nodes.ts@@ -1,8 +1,4 @@-import {- CreateNode,- SelectNode,- WorkspaceDatabaseSchema,-} from '@/main/schemas/workspace';+import { CreateNode, SelectNode } from '@/main/data/workspace/schema';import {LocalNode,LocalNodeWithChildren,@@ -39,18 +35,6 @@ export const generateNodeIndex = (return generateKeyBetween(lower, upper);};-export const buildNodeInsertMutation = (- schema: Kysely<WorkspaceDatabaseSchema>,- userId: string,- input: NodeInsertInput | NodeInsertInput[],-): CompiledQuery => {- const nodes = Array.isArray(input)- ? input.map((node) => buildCreateNode(node, userId))- : buildCreateNode(input, userId);-- return schema.insertInto('nodes').values(nodes).compile();-};-export const buildCreateNode = (input: NodeInsertInput,userId: string,diff --git a/desktop/src/lib/servers.ts b/desktop/src/lib/servers.tsindex affc2f29..5ba2e36b 100644--- a/desktop/src/lib/servers.ts+++ b/desktop/src/lib/servers.ts@@ -1,4 +1,4 @@-import { SelectServer } from '@/main/schemas/app';+import { SelectServer } from '@/main/data/app/schema';import { Server } from '@/types/servers';export const buildApiBaseUrl = (server: Server): string => {diff --git a/desktop/src/main.ts b/desktop/src/main.tsindex 3db0c251..4cb2e97c 100644--- a/desktop/src/main.ts+++ b/desktop/src/main.ts@@ -4,7 +4,7 @@ import { eventBus } from '@/lib/event-bus';import { MutationInput, MutationMap } from '@/types/mutations';import { QueryInput, QueryMap } from '@/types/queries';import { mediator } from '@/main/mediator';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';let subscriptionId: string | null = null;diff --git a/desktop/src/main/migrations/app.ts b/desktop/src/main/data/app/migrations.tssimilarity index 100%rename from desktop/src/main/migrations/app.tsrename to desktop/src/main/data/app/migrations.tsdiff --git a/desktop/src/main/schemas/app.ts b/desktop/src/main/data/app/schema.tssimilarity index 100%rename from desktop/src/main/schemas/app.tsrename to desktop/src/main/data/app/schema.tsdiff --git a/desktop/src/main/database-context.ts b/desktop/src/main/data/database-context.tssimilarity index 90%rename from desktop/src/main/database-context.tsrename to desktop/src/main/data/database-context.tsindex 471e3c40..1f9e5e1a 100644--- a/desktop/src/main/database-context.ts+++ b/desktop/src/main/data/database-context.ts@@ -1,11 +1,11 @@import { app } from 'electron';import * as fs from 'node:fs';import { Kysely, Migration, Migrator, SqliteDialect } from 'kysely';-import { AppDatabaseSchema, SelectWorkspace } from '@/main/schemas/app';-import { WorkspaceDatabaseSchema } from '@/main/schemas/workspace';-import { buildSqlite } from '@/main/utils';-import { appDatabaseMigrations } from '@/main/migrations/app';-import { workspaceDatabaseMigrations } from '@/main/migrations/workspace';+import { AppDatabaseSchema, SelectWorkspace } from '@/main/data/app/schema';+import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';+import { buildSqlite } from '@/main/data/utils';+import { appDatabaseMigrations } from '@/main/data/app/migrations';+import { workspaceDatabaseMigrations } from '@/main/data/workspace/migrations';class DatabaseContext {private readonly appPath: string;diff --git a/desktop/src/main/utils.ts b/desktop/src/main/data/utils.tssimilarity index 100%rename from desktop/src/main/utils.tsrename to desktop/src/main/data/utils.tsdiff --git a/desktop/src/main/migrations/workspace.ts b/desktop/src/main/data/workspace/migrations.tssimilarity index 100%rename from desktop/src/main/migrations/workspace.tsrename to desktop/src/main/data/workspace/migrations.tsdiff --git a/desktop/src/main/schemas/workspace.ts b/desktop/src/main/data/workspace/schema.tssimilarity index 100%rename from desktop/src/main/schemas/workspace.tsrename to desktop/src/main/data/workspace/schema.tsdiff --git a/desktop/src/main/mutations/board-view-create.ts b/desktop/src/main/mutations/board-view-create.tsindex cb4746d7..36e6b147 100644--- a/desktop/src/main/mutations/board-view-create.ts+++ b/desktop/src/main/mutations/board-view-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes, ViewNodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode, generateNodeIndex } from '@/lib/nodes';diff --git a/desktop/src/main/mutations/calendar-view-create.ts b/desktop/src/main/mutations/calendar-view-create.tsindex 3ef7d12b..b41dba08 100644--- a/desktop/src/main/mutations/calendar-view-create.ts+++ b/desktop/src/main/mutations/calendar-view-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes, ViewNodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode, generateNodeIndex } from '@/lib/nodes';diff --git a/desktop/src/main/mutations/channel-create.ts b/desktop/src/main/mutations/channel-create.tsindex 7c5a51db..3bdb9df1 100644--- a/desktop/src/main/mutations/channel-create.ts+++ b/desktop/src/main/mutations/channel-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes, ViewNodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode, generateNodeIndex } from '@/lib/nodes';diff --git a/desktop/src/main/mutations/chat-create.ts b/desktop/src/main/mutations/chat-create.tsindex 635b2688..08603ba1 100644--- a/desktop/src/main/mutations/chat-create.ts+++ b/desktop/src/main/mutations/chat-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode } from '@/lib/nodes';diff --git a/desktop/src/main/mutations/database-create.ts b/desktop/src/main/mutations/database-create.tsindex 9411cc38..a3d9d3d7 100644--- a/desktop/src/main/mutations/database-create.ts+++ b/desktop/src/main/mutations/database-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode, generateNodeIndex } from '@/lib/nodes';diff --git a/desktop/src/main/mutations/email-login.ts b/desktop/src/main/mutations/email-login.tsindex 6a45428d..86ce2b82 100644--- a/desktop/src/main/mutations/email-login.ts+++ b/desktop/src/main/mutations/email-login.ts@@ -1,6 +1,6 @@import axios from 'axios';import { LoginOutput } from '@/types/accounts';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { buildApiBaseUrl, mapServer } from '@/lib/servers';import { EmailLoginMutationInput } from '@/types/mutations/email-login';import {diff --git a/desktop/src/main/mutations/email-register.ts b/desktop/src/main/mutations/email-register.tsindex 8571e424..dc1a14b6 100644--- a/desktop/src/main/mutations/email-register.ts+++ b/desktop/src/main/mutations/email-register.ts@@ -1,6 +1,6 @@import axios from 'axios';import { LoginOutput } from '@/types/accounts';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { buildApiBaseUrl, mapServer } from '@/lib/servers';import { EmailRegisterMutationInput } from '@/types/mutations/email-register';import {diff --git a/desktop/src/main/mutations/field-create.ts b/desktop/src/main/mutations/field-create.tsindex e953d206..83fc03b2 100644--- a/desktop/src/main/mutations/field-create.ts+++ b/desktop/src/main/mutations/field-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes, ViewNodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode, generateNodeIndex } from '@/lib/nodes';diff --git a/desktop/src/main/mutations/message-create.ts b/desktop/src/main/mutations/message-create.tsindex b148278a..4f13a9dd 100644--- a/desktop/src/main/mutations/message-create.ts+++ b/desktop/src/main/mutations/message-create.ts@@ -1,12 +1,12 @@import { mapContentsToEditorNodes } from '@/renderer/editor/mappers';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode } from '@/lib/nodes';import { MutationHandler, MutationResult } from '@/types/mutations';import { MessageCreateMutationInput } from '@/types/mutations/message-create';import { LocalNode } from '@/types/nodes';-import { CreateNode } from '@/main/schemas/workspace';+import { CreateNode } from '@/main/data/workspace/schema';export class MessageCreateMutationHandlerimplements MutationHandler<MessageCreateMutationInput>diff --git a/desktop/src/main/mutations/node-attribute-delete.ts b/desktop/src/main/mutations/node-attribute-delete.tsindex 014d5d82..1f10d2cd 100644--- a/desktop/src/main/mutations/node-attribute-delete.ts+++ b/desktop/src/main/mutations/node-attribute-delete.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NeuronId } from '@/lib/id';import { MutationHandler, MutationResult } from '@/types/mutations';import { NodeAttributeDeleteMutationInput } from '@/types/mutations/node-attribute-delete';diff --git a/desktop/src/main/mutations/node-attribute-set.ts b/desktop/src/main/mutations/node-attribute-set.tsindex 0ca318c2..ca583b09 100644--- a/desktop/src/main/mutations/node-attribute-set.ts+++ b/desktop/src/main/mutations/node-attribute-set.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NeuronId } from '@/lib/id';import { MutationHandler, MutationResult } from '@/types/mutations';import { NodeAttributeSetMutationInput } from '@/types/mutations/node-attribute-set';diff --git a/desktop/src/main/mutations/node-collaborator-create.ts b/desktop/src/main/mutations/node-collaborator-create.tsindex 3fac3939..ac853145 100644--- a/desktop/src/main/mutations/node-collaborator-create.ts+++ b/desktop/src/main/mutations/node-collaborator-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NeuronId } from '@/lib/id';import { MutationHandler, MutationResult } from '@/types/mutations';import { NodeCollaboratorCreateMutationInput } from '@/types/mutations/node-collaborator-create';diff --git a/desktop/src/main/mutations/node-collaborator-delete.ts b/desktop/src/main/mutations/node-collaborator-delete.tsindex 62313541..89a7530a 100644--- a/desktop/src/main/mutations/node-collaborator-delete.ts+++ b/desktop/src/main/mutations/node-collaborator-delete.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { MutationHandler, MutationResult } from '@/types/mutations';import { NodeCollaboratorDeleteMutationInput } from '@/types/mutations/node-collaborator-delete';diff --git a/desktop/src/main/mutations/node-collaborator-update.ts b/desktop/src/main/mutations/node-collaborator-update.tsindex e692de6f..1bc1f2af 100644--- a/desktop/src/main/mutations/node-collaborator-update.ts+++ b/desktop/src/main/mutations/node-collaborator-update.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NeuronId } from '@/lib/id';import { MutationHandler, MutationResult } from '@/types/mutations';import { NodeCollaboratorUpdateMutationInput } from '@/types/mutations/node-collaborator-update';diff --git a/desktop/src/main/mutations/node-delete.ts b/desktop/src/main/mutations/node-delete.tsindex 0ab0752f..ddd888aa 100644--- a/desktop/src/main/mutations/node-delete.ts+++ b/desktop/src/main/mutations/node-delete.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { MutationHandler, MutationResult } from '@/types/mutations';import { NodeDeleteMutationInput } from '@/types/mutations/node-delete';diff --git a/desktop/src/main/mutations/node-reaction-create.ts b/desktop/src/main/mutations/node-reaction-create.tsindex 55d9ccda..b1233e64 100644--- a/desktop/src/main/mutations/node-reaction-create.ts+++ b/desktop/src/main/mutations/node-reaction-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { MutationHandler, MutationResult } from '@/types/mutations';import { NodeReactionCreateMutationInput } from '@/types/mutations/node-reaction-create';diff --git a/desktop/src/main/mutations/node-reaction-delete.ts b/desktop/src/main/mutations/node-reaction-delete.tsindex 042b0f5d..2f9f5eec 100644--- a/desktop/src/main/mutations/node-reaction-delete.ts+++ b/desktop/src/main/mutations/node-reaction-delete.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { MutationHandler, MutationResult } from '@/types/mutations';import { NodeReactionDeleteMutationInput } from '@/types/mutations/node-reaction-delete';diff --git a/desktop/src/main/mutations/page-create.ts b/desktop/src/main/mutations/page-create.tsindex 9a6d2fa6..0d7291b2 100644--- a/desktop/src/main/mutations/page-create.ts+++ b/desktop/src/main/mutations/page-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes, ViewNodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode, generateNodeIndex } from '@/lib/nodes';diff --git a/desktop/src/main/mutations/record-create.ts b/desktop/src/main/mutations/record-create.tsindex badb0e3e..fc68e9cd 100644--- a/desktop/src/main/mutations/record-create.ts+++ b/desktop/src/main/mutations/record-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode, generateNodeIndex } from '@/lib/nodes';diff --git a/desktop/src/main/mutations/select-option-create.ts b/desktop/src/main/mutations/select-option-create.tsindex a9c1da2d..1240c42d 100644--- a/desktop/src/main/mutations/select-option-create.ts+++ b/desktop/src/main/mutations/select-option-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode, generateNodeIndex } from '@/lib/nodes';diff --git a/desktop/src/main/mutations/server-create.ts b/desktop/src/main/mutations/server-create.tsindex d17ba26b..a22ec93c 100644--- a/desktop/src/main/mutations/server-create.ts+++ b/desktop/src/main/mutations/server-create.ts@@ -1,5 +1,5 @@import axios from 'axios';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { MutationHandler, MutationResult } from '@/types/mutations';import { ServerCreateMutationInput } from '@/types/mutations/server-create';import { ServerConfig } from '@/types/servers';diff --git a/desktop/src/main/mutations/space-create.ts b/desktop/src/main/mutations/space-create.tsindex a1cac031..1155b154 100644--- a/desktop/src/main/mutations/space-create.ts+++ b/desktop/src/main/mutations/space-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode, generateNodeIndex } from '@/lib/nodes';diff --git a/desktop/src/main/mutations/table-view-create.ts b/desktop/src/main/mutations/table-view-create.tsindex c492ff5d..cb38f76a 100644--- a/desktop/src/main/mutations/table-view-create.ts+++ b/desktop/src/main/mutations/table-view-create.ts@@ -1,4 +1,4 @@-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { NodeTypes, ViewNodeTypes } from '@/lib/constants';import { NeuronId } from '@/lib/id';import { buildCreateNode, generateNodeIndex } from '@/lib/nodes';diff --git a/desktop/src/main/mutations/workspace-account-role-update.ts b/desktop/src/main/mutations/workspace-account-role-update.tsindex 260703b3..bdd433f7 100644--- a/desktop/src/main/mutations/workspace-account-role-update.ts+++ b/desktop/src/main/mutations/workspace-account-role-update.ts@@ -1,5 +1,5 @@import axios from 'axios';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { buildApiBaseUrl, mapServer } from '@/lib/servers';import { WorkspaceAccountRoleUpdateMutationInput } from '@/types/mutations/workspace-account-role-update';import {diff --git a/desktop/src/main/mutations/workspace-accounts-invite.ts b/desktop/src/main/mutations/workspace-accounts-invite.tsindex bb409343..59dab2e6 100644--- a/desktop/src/main/mutations/workspace-accounts-invite.ts+++ b/desktop/src/main/mutations/workspace-accounts-invite.ts@@ -1,5 +1,5 @@import axios from 'axios';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { buildApiBaseUrl, mapServer } from '@/lib/servers';import { WorkspaceAccountsInviteMutationInput } from '@/types/mutations/workspace-accounts-invite';import {@@ -8,7 +8,7 @@ import {MutationResult,} from '@/types/mutations';import { WorkspaceAccountsInviteOutput } from '@/types/workspaces';-import { CreateNode } from '@/main/schemas/workspace';+import { CreateNode } from '@/main/data/workspace/schema';export class WorkspaceAccountsInviteMutationHandlerimplements MutationHandler<WorkspaceAccountsInviteMutationInput>diff --git a/desktop/src/main/mutations/workspace-create.ts b/desktop/src/main/mutations/workspace-create.tsindex dd8bbc8e..01a78e5e 100644--- a/desktop/src/main/mutations/workspace-create.ts+++ b/desktop/src/main/mutations/workspace-create.ts@@ -1,5 +1,5 @@import axios from 'axios';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { buildApiBaseUrl, mapServer } from '@/lib/servers';import { WorkspaceCreateMutationInput } from '@/types/mutations/workspace-create';import {diff --git a/desktop/src/main/mutations/workspace-update.ts b/desktop/src/main/mutations/workspace-update.tsindex ad66421b..d307bee2 100644--- a/desktop/src/main/mutations/workspace-update.ts+++ b/desktop/src/main/mutations/workspace-update.ts@@ -1,5 +1,5 @@import axios from 'axios';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { buildApiBaseUrl, mapServer } from '@/lib/servers';import { WorkspaceUpdateMutationInput } from '@/types/mutations/workspace-update';import {diff --git a/desktop/src/main/queries/accounts-list.ts b/desktop/src/main/queries/accounts-list.tsindex b6b45b1f..0ebd4acc 100644--- a/desktop/src/main/queries/accounts-list.ts+++ b/desktop/src/main/queries/accounts-list.ts@@ -1,8 +1,8 @@import { AccountListQueryInput } from '@/types/queries/account-list';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { Account } from '@/types/accounts';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';-import { SelectAccount } from '../schemas/app';+import { SelectAccount } from '@/main/data/app/schema';import { isEqual } from 'lodash';import { MutationChange } from '@/types/mutations';diff --git a/desktop/src/main/queries/breadcrumb-list.ts b/desktop/src/main/queries/breadcrumb-list.tsindex 1894463b..89a8fcbb 100644--- a/desktop/src/main/queries/breadcrumb-list.ts+++ b/desktop/src/main/queries/breadcrumb-list.ts@@ -1,8 +1,8 @@import { BreadcrumbListQueryInput } from '@/types/queries/breadcrumb-list';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { sql } from 'kysely';-import { SelectNode } from '@/main/schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { BreadcrumbNode } from '@/types/workspaces';import { mapNode } from '@/lib/nodes';import { isEqual } from 'lodash';diff --git a/desktop/src/main/queries/database-get.ts b/desktop/src/main/queries/database-get.tsindex afde2fb3..a2423a94 100644--- a/desktop/src/main/queries/database-get.ts+++ b/desktop/src/main/queries/database-get.ts@@ -1,8 +1,8 @@import { DatabaseGetQueryInput } from '@/types/queries/database-get';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { sql } from 'kysely';-import { SelectNode } from '@/main/schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { mapNode } from '@/lib/nodes';import { NodeTypes } from '@/lib/constants';import {diff --git a/desktop/src/main/queries/database-view-list.ts b/desktop/src/main/queries/database-view-list.tsindex 5a6a6cbb..fe44ecd2 100644--- a/desktop/src/main/queries/database-view-list.ts+++ b/desktop/src/main/queries/database-view-list.ts@@ -1,7 +1,7 @@import { DatabaseViewListQueryInput } from '@/types/queries/database-view-list';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';-import { SelectNode } from '@/main/schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { mapNode } from '@/lib/nodes';import { NodeTypes, ViewNodeTypes } from '@/lib/constants';import { LocalNode } from '@/types/nodes';diff --git a/desktop/src/main/queries/document-get.ts b/desktop/src/main/queries/document-get.tsindex dee0db42..f97e9623 100644--- a/desktop/src/main/queries/document-get.ts+++ b/desktop/src/main/queries/document-get.ts@@ -1,8 +1,8 @@import { DocumentGetQueryInput } from '@/types/queries/document-get';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { sql } from 'kysely';-import { SelectNode } from '@/main/schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { mapNode } from '@/lib/nodes';import { NodeTypes } from '@/lib/constants';import { LocalNode } from '@/types/nodes';diff --git a/desktop/src/main/queries/message-list.ts b/desktop/src/main/queries/message-list.tsindex 7325bfc9..54ee95b6 100644--- a/desktop/src/main/queries/message-list.ts+++ b/desktop/src/main/queries/message-list.ts@@ -1,8 +1,8 @@import { MessageListQueryInput } from '@/types/queries/message-list';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { MutationChange } from '@/types/mutations';-import { SelectNode } from '@/main/schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { sql } from 'kysely';import { NodeTypes } from '@/lib/constants';import { MessageNode, MessageReactionCount } from '@/types/messages';diff --git a/desktop/src/main/queries/node-collaborator-list.tsx b/desktop/src/main/queries/node-collaborator-list.tsxindex e28a88f2..0404238a 100644--- a/desktop/src/main/queries/node-collaborator-list.tsx+++ b/desktop/src/main/queries/node-collaborator-list.tsx@@ -1,5 +1,5 @@import { NodeCollaboratorListQueryInput } from '@/types/queries/node-collaborator-list';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { sql } from 'kysely';import { NodeTypes } from '@/lib/constants';diff --git a/desktop/src/main/queries/node-collaborator-search.ts b/desktop/src/main/queries/node-collaborator-search.tsindex bdcadbe8..0ef9fe3e 100644--- a/desktop/src/main/queries/node-collaborator-search.ts+++ b/desktop/src/main/queries/node-collaborator-search.ts@@ -1,8 +1,8 @@import { NodeCollaboratorSearchQueryInput } from '@/types/queries/node-collaborator-search';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { sql } from 'kysely';-import { SelectNode } from '@/main/schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { NodeTypes } from '@/lib/constants';import { NodeCollaboratorNode } from '@/types/nodes';import { MutationChange } from '@/types/mutations';diff --git a/desktop/src/main/queries/node-get.ts b/desktop/src/main/queries/node-get.tsindex 1097acd1..df78e1d8 100644--- a/desktop/src/main/queries/node-get.ts+++ b/desktop/src/main/queries/node-get.ts@@ -1,8 +1,8 @@import { NodeGetQueryInput } from '@/types/queries/node-get';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { mapNode } from '@/lib/nodes';-import { SelectNode } from '../schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { MutationChange } from '@/types/mutations';import { isEqual } from 'lodash';diff --git a/desktop/src/main/queries/record-get.ts b/desktop/src/main/queries/record-get.tsindex ba57f528..8a02d4c5 100644--- a/desktop/src/main/queries/record-get.ts+++ b/desktop/src/main/queries/record-get.ts@@ -1,9 +1,9 @@import { RecordGetQueryInput } from '@/types/queries/record-get';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { mapNode } from '@/lib/nodes';import { sql } from 'kysely';-import { SelectNode } from '../schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { RecordNode } from '@/types/databases';import { NodeTypes } from '@/lib/constants';import { MutationChange } from '@/types/mutations';diff --git a/desktop/src/main/queries/record-list.ts b/desktop/src/main/queries/record-list.tsindex 8f50172d..13c52b88 100644--- a/desktop/src/main/queries/record-list.ts+++ b/desktop/src/main/queries/record-list.ts@@ -1,8 +1,8 @@import { RecordListQueryInput } from '@/types/queries/record-list';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { MutationChange } from '@/types/mutations';-import { SelectNode } from '../schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { sql } from 'kysely';import {BooleanFieldNode,diff --git a/desktop/src/main/queries/server-list.ts b/desktop/src/main/queries/server-list.tsindex 9e2d7166..d089630b 100644--- a/desktop/src/main/queries/server-list.ts+++ b/desktop/src/main/queries/server-list.ts@@ -1,8 +1,8 @@import { ServerListQueryInput } from '@/types/queries/server-list';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { mapServer } from '@/lib/servers';-import { SelectServer } from '../schemas/app';+import { SelectServer } from '@/main/data/app/schema';import { MutationChange } from '@/types/mutations';import { isEqual } from 'lodash';diff --git a/desktop/src/main/queries/sidebar-chat-list.ts b/desktop/src/main/queries/sidebar-chat-list.tsindex 1de5bfd5..791cb7b0 100644--- a/desktop/src/main/queries/sidebar-chat-list.ts+++ b/desktop/src/main/queries/sidebar-chat-list.ts@@ -1,8 +1,8 @@import { SidebarChatListQueryInput } from '@/types/queries/sidebar-chat-list';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { sql } from 'kysely';-import { SelectNode } from '@/main/schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { NodeTypes } from '@/lib/constants';import { SidebarChatNode } from '@/types/workspaces';import { mapNode } from '@/lib/nodes';diff --git a/desktop/src/main/queries/sidebar-space-list.ts b/desktop/src/main/queries/sidebar-space-list.tsindex 37fd6e1e..c1c4dd63 100644--- a/desktop/src/main/queries/sidebar-space-list.ts+++ b/desktop/src/main/queries/sidebar-space-list.ts@@ -1,8 +1,8 @@import { SidebarSpaceListQueryInput } from '@/types/queries/sidebar-space-list';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { sql } from 'kysely';-import { SelectNode } from '@/main/schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { NodeTypes } from '@/lib/constants';import { SidebarNode, SidebarSpaceNode } from '@/types/workspaces';import { mapNode } from '@/lib/nodes';diff --git a/desktop/src/main/queries/user-search.ts b/desktop/src/main/queries/user-search.tsindex 6dc49b0f..f7f8672e 100644--- a/desktop/src/main/queries/user-search.ts+++ b/desktop/src/main/queries/user-search.ts@@ -1,8 +1,8 @@import { UserSearchQueryInput } from '@/types/queries/user-search';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { sql } from 'kysely';-import { SelectNode } from '@/main/schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { NodeTypes } from '@/lib/constants';import { UserNode } from '@/types/users';import { MutationChange } from '@/types/mutations';diff --git a/desktop/src/main/queries/workspace-list.ts b/desktop/src/main/queries/workspace-list.tsindex fe5ba294..53031f48 100644--- a/desktop/src/main/queries/workspace-list.ts+++ b/desktop/src/main/queries/workspace-list.ts@@ -1,8 +1,8 @@import { WorkspaceListQueryInput } from '@/types/queries/workspace-list';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { Workspace, WorkspaceRole } from '@/types/workspaces';-import { SelectWorkspace } from '../schemas/app';+import { SelectWorkspace } from '@/main/data/app/schema';import { MutationChange } from '@/types/mutations';import { isEqual } from 'lodash';diff --git a/desktop/src/main/queries/workspace-user-list.ts b/desktop/src/main/queries/workspace-user-list.tsindex e8be1f63..7e151ea7 100644--- a/desktop/src/main/queries/workspace-user-list.ts+++ b/desktop/src/main/queries/workspace-user-list.ts@@ -1,9 +1,9 @@import { WorkspaceUserListQueryInput } from '@/types/queries/workspace-user-list';-import { databaseContext } from '@/main/database-context';+import { databaseContext } from '@/main/data/database-context';import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries';import { NodeTypes } from '@/lib/constants';import { mapNode } from '@/lib/nodes';-import { SelectNode } from '../schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { LocalNode } from '@/types/nodes';import { MutationChange } from '@/types/mutations';import { isEqual } from 'lodash';diff --git a/desktop/src/main/workspace-manager.ts b/desktop/src/main/workspace-manager.tsindex 4d42b161..c9002d8c 100644--- a/desktop/src/main/workspace-manager.ts+++ b/desktop/src/main/workspace-manager.ts@@ -11,13 +11,13 @@ import { Workspace, WorkspaceSyncData } from '@/types/workspaces';import {SelectNodeCollaborator,WorkspaceDatabaseSchema,-} from '@/main/schemas/workspace';-import { workspaceDatabaseMigrations } from '@/main/migrations/workspace';+} from '@/main/data/workspace/schema';+import { workspaceDatabaseMigrations } from '@/main/data/workspace/migrations';import {buildSqlite,extractTablesFromSql,resultHasChanged,-} from '@/main/utils';+} from '@/main/data/utils';import {ServerExecuteMutationsResponse,ServerMutation,@@ -30,7 +30,7 @@ import {ServerNodeCollaborator,ServerNodeReaction,} from '@/types/nodes';-import { SelectNode } from '@/main/schemas/workspace';+import { SelectNode } from '@/main/data/workspace/schema';import { BackoffCalculator } from '@/lib/backoff-calculator';import * as Y from 'yjs';import { fromUint8Array, toUint8Array } from 'js-base64';diff --git a/desktop/src/renderer/components/root.tsx b/desktop/src/renderer/components/root.tsxindex 3f324452..c48332f3 100644--- a/desktop/src/renderer/components/root.tsx+++ b/desktop/src/renderer/components/root.tsx@@ -8,10 +8,8 @@ import { Workspace } from '@/renderer/components/workspaces/workspace';import { WorkspaceRedirect } from '@/renderer/components/workspaces/workspace-redirect';import { createBrowserRouter, RouterProvider } from 'react-router-dom';import { Container } from '@/renderer/components/workspaces/containers/container';-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';import { DndProvider } from 'react-dnd';import { HTML5Backend } from 'react-dnd-html5-backend';-import { useEventBus } from '@/renderer/hooks/use-event-bus';const router = createBrowserRouter([{@@ -41,87 +39,13 @@ const router = createBrowserRouter([]);export const Root = () => {- const eventBus = useEventBus();- const queryClient = React.useMemo(() => {- return new QueryClient({- defaultOptions: {- queries: {- retry: false,- },- },- });- }, []);-- React.useEffect(() => {- const id = eventBus.subscribe((event) => {- if (event.event === 'app_query_updated') {- const result = event.payload.result;- const queryKey = event.payload.key;- const page = event.payload.page;-- if (!result) {- return;- }-- if (!queryKey) {- return;- }-- const existingData = queryClient.getQueryData<any>(queryKey);-- if (!existingData) {- window.neuron.unsubscribeAppQuery(queryKey);- return;- }-- if (page !== undefined && page != null) {- const index = existingData.pageParams.indexOf(page);- if (index === -1) {- return;- }-- const newData = {- pageParams: existingData.pageParams,- pages: existingData.pages.map((p: any, i: number) => {- if (i === index) {- return result;- }-- return p;- }),- };- queryClient.setQueryData(queryKey, newData);- } else {- queryClient.setQueryData(queryKey, result);- }- }- });-- queryClient.getQueryCache().subscribe(async (event) => {- if (- event.type === 'removed' &&- event.query &&- event.query.queryKey &&- event.query.queryKey.length > 0- ) {- await window.neuron.unsubscribeAppQuery(event.query.queryKey);- }- });-- return () => {- eventBus.unsubscribe(id);- };- }, []);-return (- <QueryClientProvider client={queryClient}>- <DndProvider backend={HTML5Backend}>- <TooltipProvider>- <RouterProvider router={router} />- </TooltipProvider>- <Toaster />- </DndProvider>- </QueryClientProvider>+ <DndProvider backend={HTML5Backend}>+ <TooltipProvider>+ <RouterProvider router={router} />+ </TooltipProvider>+ <Toaster />+ </DndProvider>);};diff --git a/desktop/src/renderer/editor/observer.ts b/desktop/src/renderer/editor/observer.tsindex f72d8bb1..59bed194 100644--- a/desktop/src/renderer/editor/observer.ts+++ b/desktop/src/renderer/editor/observer.ts@@ -1,4 +1,4 @@-import { WorkspaceDatabaseSchema } from '@/main/schemas/workspace';+import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';import { NeuronId } from '@/lib/id';import { LocalNode } from '@/types/nodes';import { Workspace } from '@/types/workspaces';@@ -250,11 +250,11 @@ export class EditorObserver {deleteQueries.length > 0) {const queries = [...insertQueries, ...updateQueries, ...deleteQueries];- await window.neuron.executeWorkspaceMutation(- this.workspace.accountId,- this.workspace.id,- queries,- );+ // await window.neuron.executeWorkspaceMutation(+ // this.workspace.accountId,+ // this.workspace.id,+ // queries,+ // );}}diff --git a/desktop/src/types/mutations/index.ts b/desktop/src/types/mutations/index.tsindex b390020c..6f13ecfa 100644--- a/desktop/src/types/mutations/index.ts+++ b/desktop/src/types/mutations/index.ts@@ -1,5 +1,5 @@-import { AppDatabaseSchema } from '@/main/schemas/app';-import { WorkspaceDatabaseSchema } from '@/main/schemas/workspace';+import { AppDatabaseSchema } from '@/main/data/app/schema';+import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';export interface MutationMap {}diff --git a/desktop/src/types/window.d.ts b/desktop/src/types/window.d.tsindex f96399e1..abedbc22 100644--- a/desktop/src/types/window.d.ts+++ b/desktop/src/types/window.d.ts@@ -8,38 +8,6 @@ import { QueryMap, QueryInput } from '@/types/queries';interface NeuronApi {init: () => Promise<void>;logout: (accountId: string) => Promise<void>;- executeAppMutation: (- mutation: CompiledQuery | CompiledQuery[],- ) => Promise<void>;- executeAppQuery: (query: CompiledQuery<R>) => Promise<QueryResult<R>>;- executeAppQueryAndSubscribe: (- context: SubscribedQueryContext<R>,- ) => Promise<QueryResult<R>>;- unsubscribeAppQuery: (queryKey: string[]) => Promise<void>;-- executeWorkspaceMutation: (- accountId: string,- workspaceId: string,- mutation: CompiledQuery | CompiledQuery[],- ) => Promise<void>;-- executeWorkspaceQuery: (- accountId: string,- workspaceId: string,- query: CompiledQuery<R>,- ) => Promise<QueryResult<R>>;-- executeWorkspaceQueryAndSubscribe: (- accountId: string,- workspaceId: string,- context: SubscribedQueryContext<R>,- ) => Promise<QueryResult<R>>;-- unsubscribeWorkspaceQuery: (- accountId: string,- workspaceId: string,- queryKey: string[],- ) => Promise<void>;executeMutation: <T extends MutationInput>(input: T,