diff --git a/apps/desktop/package.json b/apps/desktop/package.json index e5f635b9..966d81c4 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -104,7 +104,6 @@ "tailwind-merge": "^2.5.4", "tailwindcss-animate": "^1.0.7", "ts-pattern": "^5.5.0", - "ulid": "^2.3.0", "ws": "^8.18.0" }, "devDependencies": { diff --git a/apps/desktop/src/lib/avatars.ts b/apps/desktop/src/lib/avatars.ts index 6f6577e4..858ad6be 100644 --- a/apps/desktop/src/lib/avatars.ts +++ b/apps/desktop/src/lib/avatars.ts @@ -1,5 +1,5 @@ import { hashCode } from '@/lib/utils'; -import { IdType } from '@/lib/id'; +import { IdType } from '@colanode/core'; export const getAvatarSizeClasses = (size?: string) => { if (size === 'small') { diff --git a/apps/desktop/src/lib/editor.ts b/apps/desktop/src/lib/editor.ts index 7034f568..8f1a9d4c 100644 --- a/apps/desktop/src/lib/editor.ts +++ b/apps/desktop/src/lib/editor.ts @@ -1,5 +1,4 @@ -import { EditorNodeTypes } from '@/lib/constants'; -import { generateId, getIdTypeFromNode } from '@/lib/id'; +import { EditorNodeTypes, generateId, getIdTypeFromNode } from '@colanode/core'; import { generateNodeIndex } from '@/lib/nodes'; import { compareString } from '@/lib/utils'; import { JSONContent } from '@tiptap/core'; diff --git a/apps/desktop/src/lib/nodes.ts b/apps/desktop/src/lib/nodes.ts index 86cbd151..adb2f918 100644 --- a/apps/desktop/src/lib/nodes.ts +++ b/apps/desktop/src/lib/nodes.ts @@ -1,5 +1,5 @@ import { generateKeyBetween } from 'fractional-indexing-jittered'; -import { NodeTypes } from '@/lib/constants'; +import { NodeTypes } from '@colanode/core'; export const generateNodeIndex = ( previous?: string | null, diff --git a/apps/desktop/src/main/data/utils.ts b/apps/desktop/src/main/data/utils.ts index 1cb96f4c..38f9bb59 100644 --- a/apps/desktop/src/main/data/utils.ts +++ b/apps/desktop/src/main/data/utils.ts @@ -1,6 +1,6 @@ import SQLite from 'better-sqlite3'; import { QueryResult } from 'kysely'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; export const buildSqlite = (filename: string): SQLite.Database => { const database = new SQLite(filename); @@ -17,7 +17,7 @@ export const extractTablesFromSql = (sql: string): string[] => { export const resultHasChanged = ( oldResult: QueryResult, - newResult: QueryResult, + newResult: QueryResult ): boolean => { if (oldResult.rows.length !== newResult.rows.length) { return true; diff --git a/apps/desktop/src/main/handlers/mutations/channel-create.ts b/apps/desktop/src/main/handlers/mutations/channel-create.ts index 1216875c..7c140c9e 100644 --- a/apps/desktop/src/main/handlers/mutations/channel-create.ts +++ b/apps/desktop/src/main/handlers/mutations/channel-create.ts @@ -1,5 +1,5 @@ import { databaseManager } from '@/main/data/database-manager'; -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { generateNodeIndex } from '@/lib/nodes'; import { MutationHandler, MutationResult } from '@/main/types'; import { ChannelCreateMutationInput } from '@/operations/mutations/channel-create'; diff --git a/apps/desktop/src/main/handlers/mutations/chat-create.ts b/apps/desktop/src/main/handlers/mutations/chat-create.ts index 03851295..fc9119af 100644 --- a/apps/desktop/src/main/handlers/mutations/chat-create.ts +++ b/apps/desktop/src/main/handlers/mutations/chat-create.ts @@ -1,6 +1,5 @@ import { databaseManager } from '@/main/data/database-manager'; -import { NodeRole, NodeTypes } from '@/lib/constants'; -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType, NodeTypes, NodeRoles } from '@colanode/core'; import { MutationHandler, MutationResult } from '@/main/types'; import { ChatCreateMutationInput } from '@/operations/mutations/chat-create'; import { sql } from 'kysely'; @@ -44,8 +43,8 @@ export class ChatCreateMutationHandler type: 'chat', parentId: input.workspaceId, collaborators: { - [input.userId]: NodeRole.Collaborator, - [input.otherUserId]: NodeRole.Collaborator, + [input.userId]: NodeRoles.Collaborator, + [input.otherUserId]: NodeRoles.Collaborator, }, }; diff --git a/apps/desktop/src/main/handlers/mutations/database-create.ts b/apps/desktop/src/main/handlers/mutations/database-create.ts index 2f98dfd5..b82133f3 100644 --- a/apps/desktop/src/main/handlers/mutations/database-create.ts +++ b/apps/desktop/src/main/handlers/mutations/database-create.ts @@ -1,4 +1,4 @@ -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { generateNodeIndex } from '@/lib/nodes'; import { MutationHandler, MutationResult } from '@/main/types'; import { DatabaseCreateMutationInput } from '@/operations/mutations/database-create'; diff --git a/apps/desktop/src/main/handlers/mutations/field-create.ts b/apps/desktop/src/main/handlers/mutations/field-create.ts index 82d421cf..3eca4b41 100644 --- a/apps/desktop/src/main/handlers/mutations/field-create.ts +++ b/apps/desktop/src/main/handlers/mutations/field-create.ts @@ -1,4 +1,4 @@ -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { generateNodeIndex } from '@/lib/nodes'; import { compareString } from '@/lib/utils'; import { MutationHandler, MutationResult } from '@/main/types'; diff --git a/apps/desktop/src/main/handlers/mutations/file-create.ts b/apps/desktop/src/main/handlers/mutations/file-create.ts index f5753e24..88852a1e 100644 --- a/apps/desktop/src/main/handlers/mutations/file-create.ts +++ b/apps/desktop/src/main/handlers/mutations/file-create.ts @@ -1,6 +1,6 @@ import { databaseManager } from '@/main/data/database-manager'; import { MutationHandler, MutationResult } from '@/main/types'; -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { FileCreateMutationInput } from '@/operations/mutations/file-create'; import { fileManager } from '@/main/file-manager'; import { FileAttributes } from '@colanode/core'; diff --git a/apps/desktop/src/main/handlers/mutations/folder-create.ts b/apps/desktop/src/main/handlers/mutations/folder-create.ts index cb0a8b91..7a198cbd 100644 --- a/apps/desktop/src/main/handlers/mutations/folder-create.ts +++ b/apps/desktop/src/main/handlers/mutations/folder-create.ts @@ -1,4 +1,4 @@ -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { MutationHandler, MutationResult } from '@/main/types'; import { FolderCreateMutationInput } from '@/operations/mutations/folder-create'; import { FolderAttributes } from '@colanode/core'; diff --git a/apps/desktop/src/main/handlers/mutations/mark-node-as-seen.ts b/apps/desktop/src/main/handlers/mutations/mark-node-as-seen.ts index 69973470..4397ffbe 100644 --- a/apps/desktop/src/main/handlers/mutations/mark-node-as-seen.ts +++ b/apps/desktop/src/main/handlers/mutations/mark-node-as-seen.ts @@ -1,4 +1,4 @@ -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { databaseManager } from '@/main/data/database-manager'; import { MutationHandler, MutationResult } from '@/main/types'; import { MarkNodeAsSeenMutationInput } from '@/operations/mutations/mark-node-as-seen'; diff --git a/apps/desktop/src/main/handlers/mutations/message-create.ts b/apps/desktop/src/main/handlers/mutations/message-create.ts index 5d1abd47..f0a81056 100644 --- a/apps/desktop/src/main/handlers/mutations/message-create.ts +++ b/apps/desktop/src/main/handlers/mutations/message-create.ts @@ -1,7 +1,6 @@ import * as Y from 'yjs'; import { databaseManager } from '@/main/data/database-manager'; -import { EditorNodeTypes, NodeTypes } from '@/lib/constants'; -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType, EditorNodeTypes, NodeTypes } from '@colanode/core'; import { MutationChange, MutationHandler, MutationResult } from '@/main/types'; import { MessageCreateMutationInput } from '@/operations/mutations/message-create'; import { mapContentsToBlocks } from '@/lib/editor'; diff --git a/apps/desktop/src/main/handlers/mutations/node-attribute-delete.ts b/apps/desktop/src/main/handlers/mutations/node-attribute-delete.ts index ba9539c9..e5e8aa42 100644 --- a/apps/desktop/src/main/handlers/mutations/node-attribute-delete.ts +++ b/apps/desktop/src/main/handlers/mutations/node-attribute-delete.ts @@ -1,7 +1,7 @@ import { MutationHandler, MutationResult } from '@/main/types'; import { NodeAttributeDeleteMutationInput } from '@/operations/mutations/node-attribute-delete'; import { nodeManager } from '@/main/node-manager'; -import { unset } from 'lodash'; +import { unset } from 'lodash-es'; export class NodeAttributeDeleteMutationHandler implements MutationHandler diff --git a/apps/desktop/src/main/handlers/mutations/node-attribute-set.ts b/apps/desktop/src/main/handlers/mutations/node-attribute-set.ts index f2c84b43..d0707844 100644 --- a/apps/desktop/src/main/handlers/mutations/node-attribute-set.ts +++ b/apps/desktop/src/main/handlers/mutations/node-attribute-set.ts @@ -1,7 +1,7 @@ import { MutationHandler, MutationResult } from '@/main/types'; import { NodeAttributeSetMutationInput } from '@/operations/mutations/node-attribute-set'; import { nodeManager } from '@/main/node-manager'; -import { set } from 'lodash'; +import { set } from 'lodash-es'; export class NodeAttributeSetMutationHandler implements MutationHandler diff --git a/apps/desktop/src/main/handlers/mutations/node-collaborator-create.ts b/apps/desktop/src/main/handlers/mutations/node-collaborator-create.ts index c907b67c..d8769506 100644 --- a/apps/desktop/src/main/handlers/mutations/node-collaborator-create.ts +++ b/apps/desktop/src/main/handlers/mutations/node-collaborator-create.ts @@ -1,7 +1,7 @@ import { MutationHandler, MutationResult } from '@/main/types'; import { NodeCollaboratorCreateMutationInput } from '@/operations/mutations/node-collaborator-create'; import { nodeManager } from '@/main/node-manager'; -import { set } from 'lodash'; +import { set } from 'lodash-es'; export class NodeCollaboratorCreateMutationHandler implements MutationHandler diff --git a/apps/desktop/src/main/handlers/mutations/node-collaborator-delete.ts b/apps/desktop/src/main/handlers/mutations/node-collaborator-delete.ts index e33e5d83..dd1bec4e 100644 --- a/apps/desktop/src/main/handlers/mutations/node-collaborator-delete.ts +++ b/apps/desktop/src/main/handlers/mutations/node-collaborator-delete.ts @@ -1,7 +1,7 @@ import { nodeManager } from '@/main/node-manager'; import { MutationHandler, MutationResult } from '@/main/types'; import { NodeCollaboratorDeleteMutationInput } from '@/operations/mutations/node-collaborator-delete'; -import { unset } from 'lodash'; +import { unset } from 'lodash-es'; export class NodeCollaboratorDeleteMutationHandler implements MutationHandler diff --git a/apps/desktop/src/main/handlers/mutations/node-collaborator-update.ts b/apps/desktop/src/main/handlers/mutations/node-collaborator-update.ts index ef1f3a18..be2aaaeb 100644 --- a/apps/desktop/src/main/handlers/mutations/node-collaborator-update.ts +++ b/apps/desktop/src/main/handlers/mutations/node-collaborator-update.ts @@ -1,7 +1,7 @@ import { nodeManager } from '@/main/node-manager'; import { MutationHandler, MutationResult } from '@/main/types'; import { NodeCollaboratorUpdateMutationInput } from '@/operations/mutations/node-collaborator-update'; -import { set } from 'lodash'; +import { set } from 'lodash-es'; export class NodeCollaboratorUpdateMutationHandler implements MutationHandler diff --git a/apps/desktop/src/main/handlers/mutations/node-delete.ts b/apps/desktop/src/main/handlers/mutations/node-delete.ts index 3dbea9bc..cfa6aa2d 100644 --- a/apps/desktop/src/main/handlers/mutations/node-delete.ts +++ b/apps/desktop/src/main/handlers/mutations/node-delete.ts @@ -1,4 +1,4 @@ -import { NodeTypes } from '@/lib/constants'; +import { NodeTypes } from '@colanode/core'; import { databaseManager } from '@/main/data/database-manager'; import { fileManager } from '@/main/file-manager'; import { MutationChange, MutationHandler, MutationResult } from '@/main/types'; diff --git a/apps/desktop/src/main/handlers/mutations/page-create.ts b/apps/desktop/src/main/handlers/mutations/page-create.ts index 64f0d3c3..cfb20b49 100644 --- a/apps/desktop/src/main/handlers/mutations/page-create.ts +++ b/apps/desktop/src/main/handlers/mutations/page-create.ts @@ -1,5 +1,5 @@ import { databaseManager } from '@/main/data/database-manager'; -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { MutationHandler, MutationResult } from '@/main/types'; import { PageCreateMutationInput } from '@/operations/mutations/page-create'; import { PageAttributes } from '@colanode/core'; diff --git a/apps/desktop/src/main/handlers/mutations/record-create.ts b/apps/desktop/src/main/handlers/mutations/record-create.ts index 19a3e873..2fe2d039 100644 --- a/apps/desktop/src/main/handlers/mutations/record-create.ts +++ b/apps/desktop/src/main/handlers/mutations/record-create.ts @@ -1,5 +1,5 @@ import { databaseManager } from '@/main/data/database-manager'; -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { MutationHandler, MutationResult } from '@/main/types'; import { RecordCreateMutationInput } from '@/operations/mutations/record-create'; import { RecordAttributes } from '@colanode/core'; diff --git a/apps/desktop/src/main/handlers/mutations/select-option-create.ts b/apps/desktop/src/main/handlers/mutations/select-option-create.ts index 885afe26..23800ea3 100644 --- a/apps/desktop/src/main/handlers/mutations/select-option-create.ts +++ b/apps/desktop/src/main/handlers/mutations/select-option-create.ts @@ -1,4 +1,4 @@ -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { generateNodeIndex } from '@/lib/nodes'; import { MutationHandler, MutationResult } from '@/main/types'; import { SelectOptionCreateMutationInput } from '@/operations/mutations/select-option-create'; diff --git a/apps/desktop/src/main/handlers/mutations/space-create.ts b/apps/desktop/src/main/handlers/mutations/space-create.ts index 5011e24c..1496c215 100644 --- a/apps/desktop/src/main/handlers/mutations/space-create.ts +++ b/apps/desktop/src/main/handlers/mutations/space-create.ts @@ -1,9 +1,8 @@ import { databaseManager } from '@/main/data/database-manager'; -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType, NodeRoles } from '@colanode/core'; import { generateNodeIndex } from '@/lib/nodes'; import { MutationHandler, MutationResult } from '@/main/types'; import { SpaceCreateMutationInput } from '@/operations/mutations/space-create'; -import { NodeRole } from '@/lib/constants'; import { ChannelAttributes, PageAttributes, @@ -26,7 +25,7 @@ export class SpaceCreateMutationHandler type: 'space', name: input.name, collaborators: { - [input.userId]: NodeRole.Admin, + [input.userId]: NodeRoles.Admin, }, parentId: input.workspaceId, description: input.description, diff --git a/apps/desktop/src/main/handlers/mutations/view-create.ts b/apps/desktop/src/main/handlers/mutations/view-create.ts index 5757cfc0..3b02c2e1 100644 --- a/apps/desktop/src/main/handlers/mutations/view-create.ts +++ b/apps/desktop/src/main/handlers/mutations/view-create.ts @@ -1,4 +1,4 @@ -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { MutationHandler, MutationResult } from '@/main/types'; import { ViewCreateMutationInput } from '@/operations/mutations/view-create'; import { compareString } from '@/lib/utils'; diff --git a/apps/desktop/src/main/handlers/queries/accounts-list.ts b/apps/desktop/src/main/handlers/queries/accounts-list.ts index 2a6e12ad..71d20696 100644 --- a/apps/desktop/src/main/handlers/queries/accounts-list.ts +++ b/apps/desktop/src/main/handlers/queries/accounts-list.ts @@ -2,7 +2,7 @@ import { AccountListQueryInput } from '@/operations/queries/account-list'; import { databaseManager } from '@/main/data/database-manager'; import { Account } from '@/types/accounts'; import { SelectAccount } from '@/main/data/app/schema'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { MutationChange, ChangeCheckResult, diff --git a/apps/desktop/src/main/handlers/queries/breadcrumb-list.ts b/apps/desktop/src/main/handlers/queries/breadcrumb-list.ts index ebb4248e..7ef4ae9a 100644 --- a/apps/desktop/src/main/handlers/queries/breadcrumb-list.ts +++ b/apps/desktop/src/main/handlers/queries/breadcrumb-list.ts @@ -4,7 +4,7 @@ import { sql } from 'kysely'; import { SelectNode } from '@/main/data/workspace/schema'; import { BreadcrumbNode } from '@/types/workspaces'; import { mapNode } from '@/main/utils'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { MutationChange, ChangeCheckResult, diff --git a/apps/desktop/src/main/handlers/queries/chat-get.ts b/apps/desktop/src/main/handlers/queries/chat-get.ts index 9d59ad02..6887cb9c 100644 --- a/apps/desktop/src/main/handlers/queries/chat-get.ts +++ b/apps/desktop/src/main/handlers/queries/chat-get.ts @@ -8,7 +8,7 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { ChatNode } from '@/types/chats'; export class ChatGetQueryHandler implements QueryHandler { diff --git a/apps/desktop/src/main/handlers/queries/document-get.ts b/apps/desktop/src/main/handlers/queries/document-get.ts index 340d8fda..55f927af 100644 --- a/apps/desktop/src/main/handlers/queries/document-get.ts +++ b/apps/desktop/src/main/handlers/queries/document-get.ts @@ -1,5 +1,5 @@ import { sha256 } from 'js-sha256'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { DocumentGetQueryInput, DocumentGetQueryOutput, diff --git a/apps/desktop/src/main/handlers/queries/file-get.ts b/apps/desktop/src/main/handlers/queries/file-get.ts index 09f843e6..a49bda7f 100644 --- a/apps/desktop/src/main/handlers/queries/file-get.ts +++ b/apps/desktop/src/main/handlers/queries/file-get.ts @@ -6,7 +6,7 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { FileDetails } from '@/types/files'; interface FileRow { diff --git a/apps/desktop/src/main/handlers/queries/file-list.ts b/apps/desktop/src/main/handlers/queries/file-list.ts index 6810ee85..a9cba360 100644 --- a/apps/desktop/src/main/handlers/queries/file-list.ts +++ b/apps/desktop/src/main/handlers/queries/file-list.ts @@ -6,9 +6,9 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { NodeTypes } from '@/lib/constants'; +import { NodeTypes } from '@colanode/core'; import { compareString } from '@/lib/utils'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { FileNode } from '@/types/files'; interface FileRow { diff --git a/apps/desktop/src/main/handlers/queries/message-list.ts b/apps/desktop/src/main/handlers/queries/message-list.ts index 5ec54c96..9d940a98 100644 --- a/apps/desktop/src/main/handlers/queries/message-list.ts +++ b/apps/desktop/src/main/handlers/queries/message-list.ts @@ -7,12 +7,12 @@ import { QueryResult, } from '@/main/types'; import { SelectNode } from '@/main/data/workspace/schema'; -import { NodeTypes } from '@/lib/constants'; +import { NodeTypes } from '@colanode/core'; import { MessageNode, MessageReactionCount } from '@/types/messages'; import { mapNode } from '@/main/utils'; import { UserNode } from '@/types/users'; import { compareString } from '@/lib/utils'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { mapBlocksToContents } from '@/lib/editor'; export class MessageListQueryHandler diff --git a/apps/desktop/src/main/handlers/queries/node-collaborator-list.ts b/apps/desktop/src/main/handlers/queries/node-collaborator-list.ts index 8977b6f6..df9ba04a 100644 --- a/apps/desktop/src/main/handlers/queries/node-collaborator-list.ts +++ b/apps/desktop/src/main/handlers/queries/node-collaborator-list.ts @@ -12,7 +12,7 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; type ExtractedNodeCollaborator = { nodeId: string; diff --git a/apps/desktop/src/main/handlers/queries/node-collaborator-search.ts b/apps/desktop/src/main/handlers/queries/node-collaborator-search.ts index 631a38b0..315627bf 100644 --- a/apps/desktop/src/main/handlers/queries/node-collaborator-search.ts +++ b/apps/desktop/src/main/handlers/queries/node-collaborator-search.ts @@ -2,7 +2,7 @@ import { NodeCollaboratorSearchQueryInput } from '@/operations/queries/node-coll import { databaseManager } from '@/main/data/database-manager'; import { sql } from 'kysely'; import { SelectNode } from '@/main/data/workspace/schema'; -import { NodeTypes } from '@/lib/constants'; +import { NodeTypes } from '@colanode/core'; import { NodeCollaborator } from '@/types/nodes'; import { MutationChange, @@ -10,7 +10,7 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; export class NodeCollaboratorSearchQueryHandler implements QueryHandler diff --git a/apps/desktop/src/main/handlers/queries/node-get.ts b/apps/desktop/src/main/handlers/queries/node-get.ts index c0bdb340..2760e5f1 100644 --- a/apps/desktop/src/main/handlers/queries/node-get.ts +++ b/apps/desktop/src/main/handlers/queries/node-get.ts @@ -8,7 +8,7 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; export class NodeGetQueryHandler implements QueryHandler { public async handleQuery( diff --git a/apps/desktop/src/main/handlers/queries/record-list.ts b/apps/desktop/src/main/handlers/queries/record-list.ts index df84c933..a52b0570 100644 --- a/apps/desktop/src/main/handlers/queries/record-list.ts +++ b/apps/desktop/src/main/handlers/queries/record-list.ts @@ -28,8 +28,8 @@ import { } from '@colanode/core'; import { isStringArray } from '@/lib/utils'; import { mapNode } from '@/main/utils'; -import { NodeTypes } from '@/lib/constants'; -import { isEqual } from 'lodash'; +import { NodeTypes } from '@colanode/core'; +import { isEqual } from 'lodash-es'; export class RecordListQueryHandler implements QueryHandler diff --git a/apps/desktop/src/main/handlers/queries/server-list.ts b/apps/desktop/src/main/handlers/queries/server-list.ts index e95b2c28..08f0224f 100644 --- a/apps/desktop/src/main/handlers/queries/server-list.ts +++ b/apps/desktop/src/main/handlers/queries/server-list.ts @@ -7,7 +7,7 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { Server } from '@/types/servers'; export class ServerListQueryHandler diff --git a/apps/desktop/src/main/handlers/queries/sidebar-chat-list.ts b/apps/desktop/src/main/handlers/queries/sidebar-chat-list.ts index 77cc624a..89a82560 100644 --- a/apps/desktop/src/main/handlers/queries/sidebar-chat-list.ts +++ b/apps/desktop/src/main/handlers/queries/sidebar-chat-list.ts @@ -1,7 +1,7 @@ import { SidebarChatListQueryInput } from '@/operations/queries/sidebar-chat-list'; import { databaseManager } from '@/main/data/database-manager'; import { SelectNode } from '@/main/data/workspace/schema'; -import { NodeTypes } from '@/lib/constants'; +import { NodeTypes } from '@colanode/core'; import { SidebarChatNode } from '@/types/workspaces'; import { mapNode } from '@/main/utils'; import { @@ -10,7 +10,7 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; interface UnreadCountRow { node_id: string; diff --git a/apps/desktop/src/main/handlers/queries/sidebar-space-list.ts b/apps/desktop/src/main/handlers/queries/sidebar-space-list.ts index 6bafbf79..05552b18 100644 --- a/apps/desktop/src/main/handlers/queries/sidebar-space-list.ts +++ b/apps/desktop/src/main/handlers/queries/sidebar-space-list.ts @@ -2,7 +2,7 @@ import { SidebarSpaceListQueryInput } from '@/operations/queries/sidebar-space-l import { databaseManager } from '@/main/data/database-manager'; import { sql } from 'kysely'; import { SelectNode } from '@/main/data/workspace/schema'; -import { NodeTypes } from '@/lib/constants'; +import { NodeTypes } from '@colanode/core'; import { SidebarNode, SidebarSpaceNode } from '@/types/workspaces'; import { mapNode } from '@/main/utils'; import { Node } from '@colanode/core'; @@ -12,7 +12,7 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { compareString } from '@/lib/utils'; interface UnreadCountRow { diff --git a/apps/desktop/src/main/handlers/queries/user-search.ts b/apps/desktop/src/main/handlers/queries/user-search.ts index e13658f5..70230972 100644 --- a/apps/desktop/src/main/handlers/queries/user-search.ts +++ b/apps/desktop/src/main/handlers/queries/user-search.ts @@ -2,7 +2,7 @@ import { UserSearchQueryInput } from '@/operations/queries/user-search'; import { databaseManager } from '@/main/data/database-manager'; import { sql } from 'kysely'; import { SelectNode } from '@/main/data/workspace/schema'; -import { NodeTypes } from '@/lib/constants'; +import { NodeTypes } from '@colanode/core'; import { UserNode } from '@/types/users'; import { MutationChange, @@ -10,7 +10,7 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; export class UserSearchQueryHandler implements QueryHandler diff --git a/apps/desktop/src/main/handlers/queries/workspace-list.ts b/apps/desktop/src/main/handlers/queries/workspace-list.ts index 220db0e5..b29b3c3c 100644 --- a/apps/desktop/src/main/handlers/queries/workspace-list.ts +++ b/apps/desktop/src/main/handlers/queries/workspace-list.ts @@ -8,7 +8,7 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; export class WorkspaceListQueryHandler implements QueryHandler diff --git a/apps/desktop/src/main/handlers/queries/workspace-user-list.ts b/apps/desktop/src/main/handlers/queries/workspace-user-list.ts index d50d2593..f82faf6e 100644 --- a/apps/desktop/src/main/handlers/queries/workspace-user-list.ts +++ b/apps/desktop/src/main/handlers/queries/workspace-user-list.ts @@ -1,6 +1,6 @@ import { WorkspaceUserListQueryInput } from '@/operations/queries/workspace-user-list'; import { databaseManager } from '@/main/data/database-manager'; -import { NodeTypes } from '@/lib/constants'; +import { NodeTypes } from '@colanode/core'; import { mapNode } from '@/main/utils'; import { SelectNode } from '@/main/data/workspace/schema'; import { UserNode } from '@colanode/core'; @@ -10,7 +10,7 @@ import { QueryHandler, QueryResult, } from '@/main/types'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; export class WorkspaceUserListQueryHandler implements QueryHandler diff --git a/apps/desktop/src/main/node-manager.ts b/apps/desktop/src/main/node-manager.ts index d7c23d41..add0f78c 100644 --- a/apps/desktop/src/main/node-manager.ts +++ b/apps/desktop/src/main/node-manager.ts @@ -6,8 +6,7 @@ import { LocalCreateNodeChangeData, LocalUpdateNodeChangeData, } from '@/types/sync'; -import { generateId } from '@/lib/id'; -import { IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { databaseManager } from '@/main/data/database-manager'; import { hasUpdateChanges } from '@/main/utils'; import { Transaction } from 'kysely'; diff --git a/apps/desktop/src/renderer/components/avatars/avatar.tsx b/apps/desktop/src/renderer/components/avatars/avatar.tsx index 1f557e14..050fb177 100644 --- a/apps/desktop/src/renderer/components/avatars/avatar.tsx +++ b/apps/desktop/src/renderer/components/avatars/avatar.tsx @@ -5,7 +5,7 @@ import { getColorForId, getDefaultNodeAvatar, } from '@/lib/avatars'; -import { getIdType, IdType } from '@/lib/id'; +import { getIdType, IdType } from '@colanode/core'; import { getEmojiUrl } from '@/lib/emojis'; import { getIconUrl } from '@/lib/icons'; import { useAccount } from '@/renderer/contexts/account'; diff --git a/apps/desktop/src/renderer/components/databases/search/view-sort-row.tsx b/apps/desktop/src/renderer/components/databases/search/view-sort-row.tsx index 1b269dfe..9a92aba0 100644 --- a/apps/desktop/src/renderer/components/databases/search/view-sort-row.tsx +++ b/apps/desktop/src/renderer/components/databases/search/view-sort-row.tsx @@ -6,7 +6,7 @@ import { DropdownMenuTrigger, } from '@/renderer/components/ui/dropdown-menu'; import { Button } from '@/renderer/components/ui/button'; -import { SortDirections } from '@/lib/constants'; +import { SortDirections } from '@colanode/core'; import { useView } from '@/renderer/contexts/view'; import { FieldIcon } from '@/renderer/components/databases/fields/field-icon'; import { ChevronDown, Trash2 } from 'lucide-react'; diff --git a/apps/desktop/src/renderer/components/documents/document-editor.tsx b/apps/desktop/src/renderer/components/documents/document-editor.tsx index dfff079b..769c4813 100644 --- a/apps/desktop/src/renderer/components/documents/document-editor.tsx +++ b/apps/desktop/src/renderer/components/documents/document-editor.tsx @@ -1,6 +1,6 @@ import React from 'react'; import '@/renderer/styles/editor.css'; -import { debounce } from 'lodash'; +import { debounce } from 'lodash-es'; import { useEditor, EditorContent, JSONContent } from '@tiptap/react'; import { ParagraphCommand, @@ -85,7 +85,7 @@ export const DocumentEditor = ({ }, }); }, 500), - [mutate, documentId, workspace.userId], + [mutate, documentId, workspace.userId] ); const editor = useEditor( @@ -164,7 +164,7 @@ export const DocumentEditor = ({ } }, }, - [documentId], + [documentId] ); React.useEffect(() => { diff --git a/apps/desktop/src/renderer/components/folders/folder-files.tsx b/apps/desktop/src/renderer/components/folders/folder-files.tsx index e8808e30..a7b5cef9 100644 --- a/apps/desktop/src/renderer/components/folders/folder-files.tsx +++ b/apps/desktop/src/renderer/components/folders/folder-files.tsx @@ -6,7 +6,7 @@ import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query'; import { GridLayout } from '@/renderer/components/folders/grids/grid-layout'; import { ListLayout } from '@/renderer/components/folders/lists/list-layout'; import { GalleryLayout } from '@/renderer/components/folders/galleries/gallery-layout'; -import { getIdType, IdType } from '@/lib/id'; +import { getIdType, IdType } from '@colanode/core'; const FILES_PER_PAGE = 100; diff --git a/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb-item.tsx b/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb-item.tsx index 6dd24914..cf76b459 100644 --- a/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb-item.tsx +++ b/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb-item.tsx @@ -1,7 +1,7 @@ import { cn } from '@/lib/utils'; import { Avatar } from '@/renderer/components/avatars/avatar'; import { BreadcrumbNode } from '@/types/workspaces'; -import { NodeTypes } from '@/lib/constants'; +import { NodeTypes } from '@colanode/core'; interface BreadcrumbNodeProps { node: BreadcrumbNode; diff --git a/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx b/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx index e70a3d36..7d96df69 100644 --- a/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx +++ b/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx @@ -12,7 +12,7 @@ import { DropdownMenuItem, DropdownMenuTrigger, } from '@/renderer/components/ui/dropdown-menu'; -import { NodeTypes } from '@/lib/constants'; +import { NodeTypes } from '@colanode/core'; import { useWorkspace } from '@/renderer/contexts/workspace'; import { BreadcrumbItem } from '@/renderer/components/workspaces/containers/breadcrumb-item'; import { BreadcrumbItemPopover } from '@/renderer/components/workspaces/containers/breadcrumb-item-popover'; diff --git a/apps/desktop/src/renderer/components/workspaces/containers/container-header.tsx b/apps/desktop/src/renderer/components/workspaces/containers/container-header.tsx index 9765436f..3d70f7ac 100644 --- a/apps/desktop/src/renderer/components/workspaces/containers/container-header.tsx +++ b/apps/desktop/src/renderer/components/workspaces/containers/container-header.tsx @@ -1,4 +1,4 @@ -import { getIdType, IdType } from '@/lib/id'; +import { getIdType, IdType } from '@colanode/core'; import { Breadcrumb } from '@/renderer/components/workspaces/containers/breadcrumb'; import { ChatBreadcrumb } from '@/renderer/components/workspaces/containers/chat-breadcrumb'; import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover'; diff --git a/apps/desktop/src/renderer/components/workspaces/containers/container-settings.tsx b/apps/desktop/src/renderer/components/workspaces/containers/container-settings.tsx index 108479b9..dfe06839 100644 --- a/apps/desktop/src/renderer/components/workspaces/containers/container-settings.tsx +++ b/apps/desktop/src/renderer/components/workspaces/containers/container-settings.tsx @@ -1,5 +1,4 @@ -import { IdType } from '@/lib/id'; -import { getIdType } from '@/lib/id'; +import { IdType, getIdType } from '@colanode/core'; import { match } from 'ts-pattern'; import { ChannelSettings } from '@/renderer/components/channels/channel-settings'; import { PageSettings } from '@/renderer/components/pages/page-settings'; diff --git a/apps/desktop/src/renderer/components/workspaces/containers/container.tsx b/apps/desktop/src/renderer/components/workspaces/containers/container.tsx index b63810be..613bd716 100644 --- a/apps/desktop/src/renderer/components/workspaces/containers/container.tsx +++ b/apps/desktop/src/renderer/components/workspaces/containers/container.tsx @@ -8,7 +8,7 @@ import { RecordContainer } from '@/renderer/components/records/record-container' import { ChatContainer } from '@/renderer/components/chats/chat-container'; import { FolderContainer } from '@/renderer/components/folders/folder-container'; import { FileContainer } from '@/renderer/components/files/file-container'; -import { getIdType, IdType } from '@/lib/id'; +import { getIdType, IdType } from '@colanode/core'; export const Container = () => { const { nodeId } = useParams<{ nodeId: string }>(); diff --git a/apps/desktop/src/renderer/components/workspaces/modals/modal-content.tsx b/apps/desktop/src/renderer/components/workspaces/modals/modal-content.tsx index 5f881ba9..d06d6f93 100644 --- a/apps/desktop/src/renderer/components/workspaces/modals/modal-content.tsx +++ b/apps/desktop/src/renderer/components/workspaces/modals/modal-content.tsx @@ -6,7 +6,7 @@ import { RecordContainer } from '@/renderer/components/records/record-container' import { ChatContainer } from '@/renderer/components/chats/chat-container'; import { FolderContainer } from '@/renderer/components/folders/folder-container'; import { FileContainer } from '@/renderer/components/files/file-container'; -import { getIdType, IdType } from '@/lib/id'; +import { getIdType, IdType } from '@colanode/core'; interface ModalContentProps { nodeId: string; diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-form.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-form.tsx index ed0bddc5..24886dc6 100644 --- a/apps/desktop/src/renderer/components/workspaces/workspace-form.tsx +++ b/apps/desktop/src/renderer/components/workspaces/workspace-form.tsx @@ -18,7 +18,7 @@ import { toast } from '@/renderer/hooks/use-toast'; import { useMutation } from '@/renderer/hooks/use-mutation'; import { useAccount } from '@/renderer/contexts/account'; import { Avatar } from '@/renderer/components/avatars/avatar'; -import { generateId, IdType } from '@/lib/id'; +import { generateId, IdType } from '@colanode/core'; import { cn } from '@/lib/utils'; import { Upload } from 'lucide-react'; @@ -122,7 +122,7 @@ export const WorkspaceForm = ({