Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Move id and contants in core package and use lodash-es package

Hakan Shehu372fe62fa8b6
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 = <R>(
oldResult: QueryResult<R>,
- newResult: QueryResult<R>,
+ newResult: QueryResult<R>
): 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<NodeAttributeDeleteMutationInput>
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<NodeAttributeSetMutationInput>
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<NodeCollaboratorCreateMutationInput>
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<NodeCollaboratorDeleteMutationInput>
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<NodeCollaboratorUpdateMutationInput>
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<ChatGetQueryInput> {
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<NodeCollaboratorSearchQueryInput>
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<NodeGetQueryInput> {
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<RecordListQueryInput>
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<UserSearchQueryInput>
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<WorkspaceListQueryInput>
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<WorkspaceUserListQueryInput>
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 = ({
<div
className={cn(
`absolute left-0 top-0 hidden h-32 w-32 items-center justify-center overflow-hidden bg-gray-50 group-hover:inline-flex`,
- isPending ? 'inline-flex' : 'hidden',
+ isPending ? 'inline-flex' : 'hidden'
)}
>
{isPending ? (
diff --git a/apps/desktop/src/renderer/editor/commands/file.tsx b/apps/desktop/src/renderer/editor/commands/file.tsx
index 28730e0c..ae786273 100644
--- a/apps/desktop/src/renderer/editor/commands/file.tsx
+++ b/apps/desktop/src/renderer/editor/commands/file.tsx
@@ -1,5 +1,5 @@
import { EditorCommand } from '@/types/editor';
-import { NodeTypes } from '@/lib/constants';
+import { NodeTypes } from '@colanode/core';
import { FilePlus } from 'lucide-react';
export const FileCommand: EditorCommand = {
diff --git a/apps/desktop/src/renderer/editor/commands/folder.tsx b/apps/desktop/src/renderer/editor/commands/folder.tsx
index 735c025d..9a5defbf 100644
--- a/apps/desktop/src/renderer/editor/commands/folder.tsx
+++ b/apps/desktop/src/renderer/editor/commands/folder.tsx
@@ -1,5 +1,5 @@
import { EditorCommand } from '@/types/editor';
-import { NodeTypes } from '@/lib/constants';
+import { NodeTypes } from '@colanode/core';
import { Folder } from 'lucide-react';
export const FolderCommand: EditorCommand = {
diff --git a/apps/desktop/src/renderer/editor/commands/page.tsx b/apps/desktop/src/renderer/editor/commands/page.tsx
index 5c86a6e5..e9d5d686 100644
--- a/apps/desktop/src/renderer/editor/commands/page.tsx
+++ b/apps/desktop/src/renderer/editor/commands/page.tsx
@@ -1,5 +1,5 @@
import { EditorCommand } from '@/types/editor';
-import { NodeTypes } from '@/lib/constants';
+import { NodeTypes } from '@colanode/core';
import { FileText } from 'lucide-react';
export const PageCommand: EditorCommand = {
diff --git a/apps/desktop/src/renderer/editor/extensions/file-placeholder.tsx b/apps/desktop/src/renderer/editor/extensions/file-placeholder.tsx
index 0d8f57b2..f6ce6ed8 100644
--- a/apps/desktop/src/renderer/editor/extensions/file-placeholder.tsx
+++ b/apps/desktop/src/renderer/editor/extensions/file-placeholder.tsx
@@ -2,7 +2,7 @@ import { mergeAttributes, Node, CommandProps } from '@tiptap/core';
import { ReactNodeViewRenderer } from '@tiptap/react';
import { FilePlaceholderNodeView } from '@/renderer/editor/views';
import { FileMetadata } from '@/types/files';
-import { generateId, IdType } from '@/lib/id';
+import { generateId, IdType } from '@colanode/core';
declare module '@tiptap/core' {
interface Commands<ReturnType> {
diff --git a/apps/desktop/src/renderer/editor/extensions/id.tsx b/apps/desktop/src/renderer/editor/extensions/id.tsx
index 8a6eb784..fea7f089 100644
--- a/apps/desktop/src/renderer/editor/extensions/id.tsx
+++ b/apps/desktop/src/renderer/editor/extensions/id.tsx
@@ -1,7 +1,6 @@
import { Extension } from '@tiptap/react';
import { Plugin, PluginKey } from 'prosemirror-state';
-import { generateId, getIdTypeFromNode } from '@/lib/id';
-import { EditorNodeTypes } from '@/lib/constants';
+import { generateId, getIdTypeFromNode, EditorNodeTypes } from '@colanode/core';
const types = [
EditorNodeTypes.Paragraph,
diff --git a/apps/desktop/src/renderer/hooks/use-infinite-query.tsx b/apps/desktop/src/renderer/hooks/use-infinite-query.tsx
index c51cd2d5..46571ed5 100644
--- a/apps/desktop/src/renderer/hooks/use-infinite-query.tsx
+++ b/apps/desktop/src/renderer/hooks/use-infinite-query.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { QueryInput, QueryMap } from '@/operations/queries';
import { sha256 } from 'js-sha256';
import { useEventBus } from '@/renderer/hooks/use-event-bus';
-import { generateId, IdType } from '@/lib/id';
+import { generateId, IdType } from '@colanode/core';
export const useInfiniteQuery = <T extends QueryInput>({
initialPageInput,
@@ -11,7 +11,7 @@ export const useInfiniteQuery = <T extends QueryInput>({
initialPageInput: T;
getNextPageInput: (
page: number,
- pages: Array<QueryMap[T['type']]['output']>,
+ pages: Array<QueryMap[T['type']]['output']>
) => T | undefined;
}) => {
const eventBus = useEventBus();
@@ -56,7 +56,7 @@ export const useInfiniteQuery = <T extends QueryInput>({
});
subscriberIdsRef.current.push({ queryId, subscriberId });
},
- [eventBus],
+ [eventBus]
);
// Function to fetch a page
@@ -67,7 +67,7 @@ export const useInfiniteQuery = <T extends QueryInput>({
try {
const result = await window.neuron.executeQueryAndSubscribe(
queryId,
- input,
+ input
);
// Update pages state
@@ -90,7 +90,7 @@ export const useInfiniteQuery = <T extends QueryInput>({
console.error('Error executing query:', error);
}
},
- [pages, getNextPageInput, subscribeToQueryResult],
+ [pages, getNextPageInput, subscribeToQueryResult]
);
// Fetch the initial page
diff --git a/apps/desktop/src/renderer/hooks/use-query.tsx b/apps/desktop/src/renderer/hooks/use-query.tsx
index 32f5f6ec..bd36640b 100644
--- a/apps/desktop/src/renderer/hooks/use-query.tsx
+++ b/apps/desktop/src/renderer/hooks/use-query.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { QueryInput, QueryMap } from '@/operations/queries';
import { sha256 } from 'js-sha256';
import { useEventBus } from '@/renderer/hooks/use-event-bus';
-import { generateId, IdType } from '@/lib/id';
+import { generateId, IdType } from '@colanode/core';
export const useQuery = <T extends QueryInput>(input: T) => {
const eventBus = useEventBus();
diff --git a/apps/server/package.json b/apps/server/package.json
index 9e08c423..81726a7e 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -29,6 +29,8 @@
"tsup": "^8.3.0"
},
"dependencies": {
+ "@colanode/core": "workspace:*",
+ "@colanode/crdt": "workspace:*",
"@aws-sdk/client-s3": "^3.675.0",
"@aws-sdk/s3-request-presigner": "^3.675.0",
"axios": "^1.7.7",
@@ -46,7 +48,6 @@
"postgres": "^3.4.4",
"redis": "^4.7.0",
"sharp": "^0.33.5",
- "ulid": "^2.3.0",
"ws": "^8.18.0",
"yjs": "^13.6.20"
}
diff --git a/apps/server/src/lib/constants.ts b/apps/server/src/lib/constants.ts
index 50c41712..0f9176ce 100644
--- a/apps/server/src/lib/constants.ts
+++ b/apps/server/src/lib/constants.ts
@@ -1,28 +1,4 @@
-export const NodeTypes = {
- User: 'user',
- Space: 'space',
- Page: 'page',
- Channel: 'channel',
- Chat: 'chat',
- Message: 'message',
- Database: 'database',
- DatabaseReplica: 'database_replica',
- Record: 'record',
- Folder: 'folder',
- TableView: 'table_view',
- BoardView: 'board_view',
- CalendarView: 'calendar_view',
- Field: 'field',
- SelectOption: 'select_option',
- File: 'file',
-};
-
-export const NodeRoles = {
- Admin: 'admin',
- Editor: 'editor',
- Collaborator: 'collaborator',
- Viewer: 'viewer',
-};
+import { NodeRoles } from '@colanode/core';
export const hasAdminAccess = (role: string): boolean => {
return role === NodeRoles.Admin;
diff --git a/apps/server/src/lib/id.ts b/apps/server/src/lib/id.ts
deleted file mode 100644
index dd10dfcd..00000000
--- a/apps/server/src/lib/id.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { monotonicFactory } from 'ulid';
-
-const ulid = monotonicFactory();
-
-export enum IdType {
- Account = 'ac',
- Workspace = 'wc',
- User = 'us',
- Version = 've',
- Mutation = 'mu',
- Space = 'sp',
- Page = 'pg',
- Channel = 'ch',
- Chat = 'ct',
- Node = 'nd',
- Message = 'ms',
- Subscriber = 'sb',
- Paragraph = 'pa',
- Heading1 = 'h1',
- Heading2 = 'h2',
- Heading3 = 'h3',
- Blockquote = 'bq',
- CodeBlock = 'cb',
- ListItem = 'li',
- OrderedList = 'ol',
- BulletList = 'bl',
- TaskList = 'tl',
- TaskItem = 'ti',
- HorizontalRule = 'hr',
- Database = 'db',
- DatabaseReplica = 'dr',
- Record = 'rc',
- Folder = 'fl',
- TableView = 'tv',
- BoardView = 'bv',
- CalendarView = 'cv',
- Field = 'fi',
- SelectOption = 'so',
- ViewFilter = 'vf',
- ViewSort = 'vs',
- Query = 'qu',
- Device = 'dv',
- Change = 'cd',
- Avatar = 'av',
-}
-
-export const generateId = (type: IdType): string => {
- return ulid().toLowerCase() + type;
-};
-
-export const isIdOfType = (id: string, type: IdType): boolean => {
- return id.endsWith(type);
-};
-
-export const getIdType = (id: string): IdType => {
- return id.substring(id.length - 2) as IdType;
-};
diff --git a/apps/server/src/lib/workspaces.ts b/apps/server/src/lib/workspaces.ts
index 7ab49614..9015aba5 100644
--- a/apps/server/src/lib/workspaces.ts
+++ b/apps/server/src/lib/workspaces.ts
@@ -5,12 +5,12 @@ import {
WorkspaceStatus,
WorkspaceUserStatus,
} from '@/types/workspaces';
-import { generateId, IdType } from '@/lib/id';
+import { generateId, IdType, NodeRoles } from '@colanode/core';
import * as Y from 'yjs';
import { fromUint8Array } from 'js-base64';
import { NodeCreatedEvent } from '@/types/events';
import { enqueueEvent } from '@/queues/events';
-import { NodeRoles } from './constants';
+import {} from './constants';
export const createDefaultWorkspace = async (account: SelectAccount) => {
const createdAt = new Date();
@@ -64,7 +64,7 @@ export const createDefaultWorkspace = async (account: SelectAccount) => {
const buildUserNodeCreate = (
workspaceId: string,
- account: SelectAccount,
+ account: SelectAccount
): CreateNode => {
const id = generateId(IdType.User);
const versionId = generateId(IdType.Version);
@@ -99,7 +99,7 @@ const buildUserNodeCreate = (
const buildSpaceNodeCreate = (
workspaceId: string,
- userId: string,
+ userId: string
): CreateNode => {
const id = generateId(IdType.Space);
const versionId = generateId(IdType.Version);
@@ -115,7 +115,7 @@ const buildSpaceNodeCreate = (
attributesMap.set('collaborators', new Y.Map());
const collaboratorsMap = attributesMap.get(
- 'collaborators',
+ 'collaborators'
) as Y.Map<string>;
collaboratorsMap.set(userId, NodeRoles.Admin);
@@ -139,7 +139,7 @@ const buildSpaceNodeCreate = (
const buildPageNodeCreate = (
workspaceId: string,
spaceId: string,
- userId: string,
+ userId: string
): CreateNode => {
const id = generateId(IdType.Page);
const versionId = generateId(IdType.Version);
@@ -172,7 +172,7 @@ const buildPageNodeCreate = (
const buildChannelNodeCreate = (
workspaceId: string,
spaceId: string,
- userId: string,
+ userId: string
): CreateNode => {
const id = generateId(IdType.Channel);
const versionId = generateId(IdType.Version);
diff --git a/apps/server/src/queues/events.ts b/apps/server/src/queues/events.ts
index 73252484..5e6daa85 100644
--- a/apps/server/src/queues/events.ts
+++ b/apps/server/src/queues/events.ts
@@ -3,8 +3,7 @@ import { redisConfig } from '@/data/redis';
import { CreateUserNode } from '@/data/schema';
import { filesStorage } from '@/data/storage';
import { BUCKET_NAMES } from '@/data/storage';
-import { NodeTypes } from '@/lib/constants';
-import { generateId, IdType } from '@/lib/id';
+import { generateId, IdType, NodeTypes } from '@colanode/core';
import { fetchNodeCollaborators, fetchWorkspaceUsers } from '@/lib/nodes';
import { synapse } from '@/services/synapse';
import {
diff --git a/apps/server/src/routes/accounts.ts b/apps/server/src/routes/accounts.ts
index 194bc4c6..f42808f9 100644
--- a/apps/server/src/routes/accounts.ts
+++ b/apps/server/src/routes/accounts.ts
@@ -11,7 +11,7 @@ import {
} from '@/types/accounts';
import axios from 'axios';
import { ApiError, NeuronRequest, NeuronResponse } from '@/types/api';
-import { generateId, IdType } from '@/lib/id';
+import { generateId, IdType } from '@colanode/core';
import { database } from '@/data/database';
import bcrypt from 'bcrypt';
import { WorkspaceOutput, WorkspaceRole } from '@/types/workspaces';
@@ -229,7 +229,7 @@ accountsRouter.delete(
});
return res.status(200).end();
- },
+ }
);
accountsRouter.put(
@@ -285,7 +285,7 @@ accountsRouter.put(
database
.selectFrom('workspace_users')
.select('id')
- .where('account_id', '=', req.account.id),
+ .where('account_id', '=', req.account.id)
)
.execute();
@@ -301,7 +301,7 @@ accountsRouter.put(
updated_at: new Date(),
})
.where('id', '=', req.account.id)
- .compile(),
+ .compile()
);
for (const user of users) {
@@ -345,7 +345,7 @@ accountsRouter.put(
server_updated_at: updatedAt,
})
.where('id', '=', user.id)
- .compile(),
+ .compile()
);
const event: NodeUpdatedEvent = {
@@ -380,11 +380,11 @@ accountsRouter.put(
};
return res.status(200).json(output);
- },
+ }
);
const buildLoginOutput = async (
- account: SelectAccount,
+ account: SelectAccount
): Promise<LoginOutput> => {
let workspaceUsers = await database
.selectFrom('workspace_users')
@@ -420,7 +420,7 @@ const buildLoginOutput = async (
for (const workspaceUser of workspaceUsers) {
const workspace = workspaces.find(
- (w) => w.id === workspaceUser.workspace_id,
+ (w) => w.id === workspaceUser.workspace_id
);
if (!workspace) {
diff --git a/apps/server/src/routes/avatars.ts b/apps/server/src/routes/avatars.ts
index b0cfe6f7..43cdd276 100644
--- a/apps/server/src/routes/avatars.ts
+++ b/apps/server/src/routes/avatars.ts
@@ -1,5 +1,5 @@
import { avatarStorage, BUCKET_NAMES } from '@/data/storage';
-import { generateId, IdType } from '@/lib/id';
+import { generateId, IdType } from '@colanode/core';
import { PutObjectCommand, GetObjectCommand } from '@aws-sdk/client-s3';
import { Router } from 'express';
import multer from 'multer';
@@ -16,7 +16,7 @@ const upload = multer({
fileFilter: (req, file, cb) => {
const filetypes = /jpeg|jpg|png|webp/;
const extname = filetypes.test(
- path.extname(file.originalname).toLowerCase(),
+ path.extname(file.originalname).toLowerCase()
);
const mimetype = filetypes.test(file.mimetype);
diff --git a/apps/server/src/routes/workspaces.ts b/apps/server/src/routes/workspaces.ts
index b799dc3f..42381c86 100644
--- a/apps/server/src/routes/workspaces.ts
+++ b/apps/server/src/routes/workspaces.ts
@@ -8,7 +8,7 @@ import {
WorkspaceStatus,
} from '@/types/workspaces';
import { ApiError, NeuronRequest, NeuronResponse } from '@/types/api';
-import { generateId, IdType } from '@/lib/id';
+import { generateId, IdType } from '@colanode/core';
import { database } from '@/data/database';
import { Router } from 'express';
import * as Y from 'yjs';
diff --git a/apps/server/src/services/synapse.ts b/apps/server/src/services/synapse.ts
index e8a1297d..39b48080 100644
--- a/apps/server/src/services/synapse.ts
+++ b/apps/server/src/services/synapse.ts
@@ -9,7 +9,7 @@ import {
SynapseNodeChangeMessage,
SynapseUserNodeChangeMessage,
} from '@/types/synapse';
-import { getIdType, IdType } from '@/lib/id';
+import { getIdType, IdType } from '@colanode/core';
import { MessageInput } from '@/types/messages';
interface SynapseConnection {
@@ -91,20 +91,20 @@ class SynapseService {
const subscriber = redis.duplicate();
await subscriber.connect();
await subscriber.subscribe(CHANNEL_NAMES.SYNAPSE, (message) =>
- this.handleSynapseMessage(message.toString()),
+ this.handleSynapseMessage(message.toString())
);
}
private sendSocketMessage(
connection: SynapseConnection,
- message: MessageInput,
+ message: MessageInput
) {
connection.socket.send(JSON.stringify(message));
}
private async handleSocketMessage(
connection: SynapseConnection,
- message: MessageInput,
+ message: MessageInput
) {
if (message.type === 'local_node_sync') {
await database
@@ -123,7 +123,7 @@ class SynapseService {
workspace_id: message.workspaceId,
node_version_id: message.versionId,
node_synced_at: new Date(),
- }),
+ })
)
.execute();
} else if (message.type === 'local_user_node_sync') {
@@ -143,7 +143,7 @@ class SynapseService {
workspace_id: message.workspaceId,
user_node_version_id: message.versionId,
user_node_synced_at: new Date(),
- }),
+ })
)
.execute();
} else if (message.type === 'local_node_delete') {
@@ -154,7 +154,7 @@ class SynapseService {
.execute();
const userId = connection.workspaceUsers.find(
- (wu) => wu.workspaceId === message.workspaceId,
+ (wu) => wu.workspaceId === message.workspaceId
)?.userId;
if (userId) {
@@ -167,7 +167,7 @@ class SynapseService {
database
.selectFrom('workspace_users')
.select('account_id')
- .where('id', '=', userId),
+ .where('id', '=', userId)
)
.execute();
@@ -231,7 +231,7 @@ class SynapseService {
.selectFrom('user_nodes')
.selectAll()
.where((eb) =>
- eb.and([eb('user_id', 'in', userIds), eb('node_id', '=', data.nodeId)]),
+ eb.and([eb('user_id', 'in', userIds), eb('node_id', '=', data.nodeId)])
)
.execute();
@@ -317,7 +317,7 @@ class SynapseService {
}
private async handleUserNodeUpdateMessage(
- data: SynapseUserNodeChangeMessage,
+ data: SynapseUserNodeChangeMessage
) {
const userDevices = this.getWorkspaceUserDevices(data.workspaceId);
if (!userDevices.has(data.userId)) {
@@ -369,7 +369,7 @@ class SynapseService {
private async sendPendingChanges(connection: SynapseConnection) {
const userIds = connection.workspaceUsers.map(
- (workspaceUser) => workspaceUser.userId,
+ (workspaceUser) => workspaceUser.userId
);
console.log('sendPendingChanges', userIds);
@@ -384,7 +384,7 @@ class SynapseService {
.leftJoin('device_nodes as nds', (join) =>
join
.onRef('nds.node_id', '=', 'nus.node_id')
- .on('nds.device_id', '=', connection.deviceId),
+ .on('nds.device_id', '=', connection.deviceId)
)
.select([
'n.id',
@@ -420,7 +420,7 @@ class SynapseService {
eb('nds.user_node_version_id', 'is', null),
eb('nds.user_node_version_id', '!=', eb.ref('nus.version_id')),
]),
- ]),
+ ])
)
.orderBy('n.id', 'asc')
.limit(100)
@@ -509,7 +509,7 @@ class SynapseService {
}
private async fetchWorkspaceUsers(
- connection: SynapseConnection,
+ connection: SynapseConnection
): Promise<void> {
const workspaceUsers = await database
.selectFrom('workspace_users')
diff --git a/apps/server/src/validators/board-view-validator.ts b/apps/server/src/validators/board-view-validator.ts
deleted file mode 100644
index 997a4abd..00000000
--- a/apps/server/src/validators/board-view-validator.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
-import { fetchNodeRole } from '@/lib/nodes';
-import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
-import { Validator } from '@/types/validators';
-import { isEqual } from 'lodash-es';
-
-export class BoardViewValidator implements Validator {
- async canCreate(
- workspaceUser: SelectWorkspaceUser,
- attributes: ServerNodeAttributes
- ): Promise<boolean> {
- if (!attributes.parentId) {
- return false;
- }
-
- const role = await fetchNodeRole(attributes.parentId, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- if (attributes.collaborators) {
- return hasAdminAccess(role);
- }
-
- return hasEditorAccess(role);
- }
-
- async canUpdate(
- workspaceUser: SelectWorkspaceUser,
- node: ServerNode,
- attributes: ServerNodeAttributes
- ): Promise<boolean> {
- const role = await fetchNodeRole(node.id, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- if (!isEqual(node.attributes.collaborators, attributes.collaborators)) {
- return hasAdminAccess(role);
- }
-
- return hasEditorAccess(role);
- }
-
- async canDelete(
- workspaceUser: SelectWorkspaceUser,
- node: ServerNode
- ): Promise<boolean> {
- const role = await fetchNodeRole(node.id, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- return hasEditorAccess(role);
- }
-}
diff --git a/apps/server/src/validators/calendar-view-validator.ts b/apps/server/src/validators/calendar-view-validator.ts
deleted file mode 100644
index 75a05882..00000000
--- a/apps/server/src/validators/calendar-view-validator.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
-import { fetchNodeRole } from '@/lib/nodes';
-import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
-import { Validator } from '@/types/validators';
-import { isEqual } from 'lodash-es';
-
-export class CalendarViewValidator implements Validator {
- async canCreate(
- workspaceUser: SelectWorkspaceUser,
- attributes: ServerNodeAttributes
- ): Promise<boolean> {
- if (!attributes.parentId) {
- return false;
- }
-
- const parentId = attributes.parentId;
- const role = await fetchNodeRole(parentId, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- if (attributes.collaborators) {
- return hasAdminAccess(role);
- }
-
- return hasEditorAccess(role);
- }
-
- async canUpdate(
- workspaceUser: SelectWorkspaceUser,
- node: ServerNode,
- attributes: ServerNodeAttributes
- ): Promise<boolean> {
- const role = await fetchNodeRole(node.id, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- if (!isEqual(node.attributes.collaborators, attributes.collaborators)) {
- return hasAdminAccess(role);
- }
-
- return hasEditorAccess(role);
- }
-
- async canDelete(
- workspaceUser: SelectWorkspaceUser,
- node: ServerNode
- ): Promise<boolean> {
- const role = await fetchNodeRole(node.id, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- return hasEditorAccess(role);
- }
-}
diff --git a/apps/server/src/validators/field-validator.ts b/apps/server/src/validators/field-validator.ts
deleted file mode 100644
index da5ef71c..00000000
--- a/apps/server/src/validators/field-validator.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
-import { fetchNodeRole } from '@/lib/nodes';
-import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
-import { Validator } from '@/types/validators';
-
-export class FieldValidator implements Validator {
- async canCreate(
- workspaceUser: SelectWorkspaceUser,
- attributes: ServerNodeAttributes,
- ): Promise<boolean> {
- if (!attributes.parentId) {
- return false;
- }
-
- const role = await fetchNodeRole(attributes.parentId, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- return hasEditorAccess(role);
- }
-
- async canUpdate(
- workspaceUser: SelectWorkspaceUser,
- node: ServerNode,
- attributes: ServerNodeAttributes,
- ): Promise<boolean> {
- const role = await fetchNodeRole(node.id, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- return hasEditorAccess(role);
- }
-
- async canDelete(
- workspaceUser: SelectWorkspaceUser,
- node: ServerNode,
- ): Promise<boolean> {
- const role = await fetchNodeRole(node.id, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- return hasEditorAccess(role);
- }
-}
diff --git a/apps/server/src/validators/file-validator.ts b/apps/server/src/validators/file-validator.ts
index f592a94d..b06c7a65 100644
--- a/apps/server/src/validators/file-validator.ts
+++ b/apps/server/src/validators/file-validator.ts
@@ -1,5 +1,6 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasEditorAccess, NodeTypes } from '@/lib/constants';
+import { hasEditorAccess } from '@/lib/constants';
+import { NodeTypes } from '@colanode/core';
import { extractNodeRole, fetchNodeAncestors } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
@@ -7,7 +8,7 @@ import { Validator } from '@/types/validators';
export class FileValidator implements Validator {
async canCreate(
workspaceUser: SelectWorkspaceUser,
- attributes: ServerNodeAttributes,
+ attributes: ServerNodeAttributes
): Promise<boolean> {
if (!attributes.parentId) {
return false;
@@ -19,7 +20,7 @@ export class FileValidator implements Validator {
}
const parent = ancestors.find(
- (ancestor) => ancestor.id === attributes.parentId,
+ (ancestor) => ancestor.id === attributes.parentId
);
if (!parent) {
@@ -41,7 +42,7 @@ export class FileValidator implements Validator {
async canUpdate(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
- attributes: ServerNodeAttributes,
+ attributes: ServerNodeAttributes
): Promise<boolean> {
if (!attributes.parentId) {
return false;
@@ -53,7 +54,7 @@ export class FileValidator implements Validator {
}
const parent = ancestors.find(
- (ancestor) => ancestor.id === attributes.parentId,
+ (ancestor) => ancestor.id === attributes.parentId
);
if (!parent) {
@@ -74,7 +75,7 @@ export class FileValidator implements Validator {
async canDelete(
workspaceUser: SelectWorkspaceUser,
- node: ServerNode,
+ node: ServerNode
): Promise<boolean> {
if (!node.parentId) {
return false;
diff --git a/apps/server/src/validators/index.ts b/apps/server/src/validators/index.ts
index 10048dc2..59e3a1e9 100644
--- a/apps/server/src/validators/index.ts
+++ b/apps/server/src/validators/index.ts
@@ -1,35 +1,25 @@
-import { NodeTypes } from '@/lib/constants';
+import { NodeTypes } from '@colanode/core';
import { Validator } from '@/types/validators';
-import { BoardViewValidator } from '@/validators/board-view-validator';
-import { CalendarViewValidator } from '@/validators/calendar-view-validator';
import { ChannelValidator } from '@/validators/channel-validator';
import { ChatValidator } from '@/validators/chat-validator';
import { DatabaseValidator } from '@/validators/database-validator';
-import { FieldValidator } from '@/validators/field-validator';
import { FileValidator } from '@/validators/file-validator';
import { FolderValidator } from '@/validators/folder-validator';
import { MessageValidator } from '@/validators/message-validator';
import { PageValidator } from '@/validators/page-validator';
import { RecordValidator } from '@/validators/record-validator';
-import { SelectOptionValidator } from '@/validators/select-option-validator';
import { SpaceValidator } from '@/validators/space-validator';
-import { TableViewValidator } from '@/validators/table-view-validator';
const validators: Record<string, Validator> = {
- [NodeTypes.BoardView]: new BoardViewValidator(),
- [NodeTypes.CalendarView]: new CalendarViewValidator(),
[NodeTypes.Channel]: new ChannelValidator(),
[NodeTypes.Chat]: new ChatValidator(),
[NodeTypes.Database]: new DatabaseValidator(),
- [NodeTypes.Field]: new FieldValidator(),
[NodeTypes.File]: new FileValidator(),
[NodeTypes.Folder]: new FolderValidator(),
[NodeTypes.Message]: new MessageValidator(),
[NodeTypes.Page]: new PageValidator(),
[NodeTypes.Record]: new RecordValidator(),
- [NodeTypes.SelectOption]: new SelectOptionValidator(),
[NodeTypes.Space]: new SpaceValidator(),
- [NodeTypes.TableView]: new TableViewValidator(),
};
export const getValidator = (type: string): Validator | undefined => {
diff --git a/apps/server/src/validators/select-option-validator.ts b/apps/server/src/validators/select-option-validator.ts
deleted file mode 100644
index e2dfe6fc..00000000
--- a/apps/server/src/validators/select-option-validator.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
-import { fetchNodeRole } from '@/lib/nodes';
-import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
-import { Validator } from '@/types/validators';
-import { isEqual } from 'lodash-es';
-
-export class SelectOptionValidator implements Validator {
- async canCreate(
- workspaceUser: SelectWorkspaceUser,
- attributes: ServerNodeAttributes
- ): Promise<boolean> {
- if (!attributes.parentId) {
- return false;
- }
-
- const parentId = attributes.parentId;
- const role = await fetchNodeRole(parentId, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- if (attributes.collaborators) {
- return hasAdminAccess(role);
- }
-
- return hasEditorAccess(role);
- }
-
- async canUpdate(
- workspaceUser: SelectWorkspaceUser,
- node: ServerNode,
- attributes: ServerNodeAttributes
- ): Promise<boolean> {
- const role = await fetchNodeRole(node.id, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- if (!isEqual(node.attributes.collaborators, attributes.collaborators)) {
- return hasAdminAccess(role);
- }
-
- return hasEditorAccess(role);
- }
-
- async canDelete(
- workspaceUser: SelectWorkspaceUser,
- node: ServerNode
- ): Promise<boolean> {
- const role = await fetchNodeRole(node.id, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- return hasEditorAccess(role);
- }
-}
diff --git a/apps/server/src/validators/table-view-validator.ts b/apps/server/src/validators/table-view-validator.ts
deleted file mode 100644
index 3cd22ab8..00000000
--- a/apps/server/src/validators/table-view-validator.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
-import { fetchNodeRole } from '@/lib/nodes';
-import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
-import { Validator } from '@/types/validators';
-import { isEqual } from 'lodash-es';
-
-export class TableViewValidator implements Validator {
- async canCreate(
- workspaceUser: SelectWorkspaceUser,
- attributes: ServerNodeAttributes
- ): Promise<boolean> {
- if (!attributes.parentId) {
- return false;
- }
-
- const role = await fetchNodeRole(attributes.parentId, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- if (attributes.collaborators) {
- return hasAdminAccess(role);
- }
-
- return hasEditorAccess(role);
- }
-
- async canUpdate(
- workspaceUser: SelectWorkspaceUser,
- node: ServerNode,
- attributes: ServerNodeAttributes
- ): Promise<boolean> {
- const role = await fetchNodeRole(node.id, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- if (!isEqual(node.attributes.collaborators, attributes.collaborators)) {
- return hasAdminAccess(role);
- }
-
- return hasEditorAccess(role);
- }
-
- async canDelete(
- workspaceUser: SelectWorkspaceUser,
- node: ServerNode
- ): Promise<boolean> {
- const role = await fetchNodeRole(node.id, workspaceUser.id);
- if (!role) {
- return false;
- }
-
- return hasEditorAccess(role);
- }
-}
diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json
index a99f38d6..f29133f1 100644
--- a/apps/server/tsconfig.json
+++ b/apps/server/tsconfig.json
@@ -10,6 +10,9 @@
"references": [
{
"path": "../../packages/core"
+ },
+ {
+ "path": "../../packages/crdt"
}
]
}
diff --git a/packages/core/package.json b/packages/core/package.json
index c94249ce..a36e6422 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -24,6 +24,7 @@
"vitest": "^1.6.0"
},
"dependencies": {
+ "ulid": "^2.3.0",
"zod": "^3.23.8"
}
}
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index d87ba7c2..641dc37c 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,3 +1,5 @@
+export * from './lib/constants';
+export * from './lib/id';
export * from './registry/block';
export * from './registry/channel';
export * from './registry/chat';
diff --git a/apps/desktop/src/lib/constants.ts b/packages/core/src/lib/constants.ts
similarity index 97%
rename from apps/desktop/src/lib/constants.ts
rename to packages/core/src/lib/constants.ts
index 2817b9fb..276f179a 100644
--- a/apps/desktop/src/lib/constants.ts
+++ b/packages/core/src/lib/constants.ts
@@ -36,7 +36,7 @@ export const SortDirections = {
Descending: 'desc',
};
-export const NodeRole = {
+export const NodeRoles = {
Admin: 'admin',
Editor: 'editor',
Collaborator: 'collaborator',
diff --git a/apps/desktop/src/lib/id.ts b/packages/core/src/lib/id.ts
similarity index 96%
rename from apps/desktop/src/lib/id.ts
rename to packages/core/src/lib/id.ts
index 66a6bb7b..9033bc0f 100644
--- a/apps/desktop/src/lib/id.ts
+++ b/packages/core/src/lib/id.ts
@@ -1,5 +1,5 @@
import { monotonicFactory } from 'ulid';
-import { NodeTypes } from '@/lib/constants';
+import { NodeTypes } from './constants';
const ulid = monotonicFactory();
@@ -43,6 +43,7 @@ export enum IdType {
Icon = 'ic',
File = 'fi',
FilePlaceholder = 'fp',
+ Device = 'dv',
}
export const generateId = (type: IdType): string => {
diff --git a/packages/core/src/registry/channel.ts b/packages/core/src/registry/channel.ts
index c345f4c5..462bd697 100644
--- a/packages/core/src/registry/channel.ts
+++ b/packages/core/src/registry/channel.ts
@@ -1,6 +1,6 @@
import { z } from 'zod';
import { NodeModel } from './core';
-import { isEqual } from 'lodash';
+import { isEqual } from 'lodash-es';
export const channelAttributesSchema = z.object({
type: z.literal('channel'),
diff --git a/packages/core/src/registry/database.ts b/packages/core/src/registry/database.ts
index 5bc8ad08..b7f3413c 100644
--- a/packages/core/src/registry/database.ts
+++ b/packages/core/src/registry/database.ts
@@ -1,7 +1,7 @@
import { z } from 'zod';
import { NodeModel } from './core';
import { fieldAttributesSchema } from './fields';
-import { isEqual } from 'lodash';
+import { isEqual } from 'lodash-es';
export const viewFieldAttributesSchema = z.object({
id: z.string(),
diff --git a/packages/core/src/registry/folder.ts b/packages/core/src/registry/folder.ts
index d2d6b807..d79eb938 100644
--- a/packages/core/src/registry/folder.ts
+++ b/packages/core/src/registry/folder.ts
@@ -1,6 +1,6 @@
import { z } from 'zod';
import { NodeModel } from './core';
-import { isEqual } from 'lodash';
+import { isEqual } from 'lodash-es';
export const folderAttributesSchema = z.object({
type: z.literal('folder'),
diff --git a/packages/core/src/registry/message.ts b/packages/core/src/registry/message.ts
index 1c1649f6..77fe7b0d 100644
--- a/packages/core/src/registry/message.ts
+++ b/packages/core/src/registry/message.ts
@@ -1,7 +1,7 @@
import { z } from 'zod';
import { NodeModel } from './core';
import { blockSchema } from './block';
-import { isEqual } from 'lodash';
+import { isEqual } from 'lodash-es';
export const messageAttributesSchema = z.object({
type: z.literal('message'),
diff --git a/packages/core/src/registry/page.ts b/packages/core/src/registry/page.ts
index e24cefa6..4e490b8d 100644
--- a/packages/core/src/registry/page.ts
+++ b/packages/core/src/registry/page.ts
@@ -1,7 +1,7 @@
import { z } from 'zod';
import { NodeModel } from './core';
import { blockSchema } from './block';
-import { isEqual } from 'lodash';
+import { isEqual } from 'lodash-es';
export const pageAttributesSchema = z.object({
type: z.literal('page'),
diff --git a/packages/crdt/src/index.ts b/packages/crdt/src/index.ts
index ae6d1fe0..0902e37f 100644
--- a/packages/crdt/src/index.ts
+++ b/packages/crdt/src/index.ts
@@ -1,7 +1,7 @@
import { z } from 'zod';
import * as Y from 'yjs';
import { ZodText } from '@colanode/core';
-import { isEqual } from 'lodash';
+import { isEqual } from 'lodash-es';
import { diffChars } from 'diff';
export const applyCrdt = (
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d48f02a1..2dcff277 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -282,9 +282,6 @@ importers:
ts-pattern:
specifier: ^5.5.0
version: 5.5.0
- ulid:
- specifier: ^2.3.0
- version: 2.3.0
ws:
specifier: ^8.18.0
version: 8.18.0
@@ -436,9 +433,6 @@ importers:
sharp:
specifier: ^0.33.5
version: 0.33.5
- ulid:
- specifier: ^2.3.0
- version: 2.3.0
ws:
specifier: ^8.18.0
version: 8.18.0
@@ -476,6 +470,9 @@ importers:
packages/core:
dependencies:
+ ulid:
+ specifier: ^2.3.0
+ version: 2.3.0
zod:
specifier: ^3.23.8
version: 3.23.8