fix(editor): circular dependencies (#10661)

Closes: [BS-2766](https://linear.app/affine-design/issue/BS-2766/把-converttodatabase-移到-root-block-中，避免循环依赖)

blocksuite/affine/block-note/package.json

@@ -13,14 +13,12 @@
   "author": "toeverything",
   "license": "MIT",
   "dependencies": {
-    "@blocksuite/affine-block-database": "workspace:*",
     "@blocksuite/affine-block-embed": "workspace:*",
     "@blocksuite/affine-block-surface": "workspace:*",
     "@blocksuite/affine-components": "workspace:*",
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/block-std": "workspace:*",
-    "@blocksuite/data-view": "workspace:*",
     "@blocksuite/global": "workspace:*",
     "@blocksuite/icons": "^2.2.1",
     "@blocksuite/inline": "workspace:*",

blocksuite/affine/block-note/src/note-spec.ts

@@ -1,10 +1,5 @@
 import { NoteBlockSchema } from '@blocksuite/affine-model';
-import { ToolbarModuleExtension } from '@blocksuite/affine-shared/services';
-import {
-  BlockFlavourIdentifier,
-  BlockViewExtension,
-  FlavourExtension,
-} from '@blocksuite/block-std';
+import { BlockViewExtension, FlavourExtension } from '@blocksuite/block-std';
 import type { ExtensionType } from '@blocksuite/store';
 import { literal } from 'lit/static-html.js';
 
@@ -12,7 +7,6 @@ import {
   DocNoteBlockAdapterExtensions,
   EdgelessNoteBlockAdapterExtensions,
 } from './adapters/index.js';
-import { builtinToolbarConfig } from './configs/toolbar.js';
 import { NoteBlockService } from './note-service.js';
 
 const flavour = NoteBlockSchema.model.flavour;
@@ -22,10 +16,6 @@ export const NoteBlockSpec: ExtensionType[] = [
   NoteBlockService,
   BlockViewExtension(flavour, literal`affine-note`),
   DocNoteBlockAdapterExtensions,
-  ToolbarModuleExtension({
-    id: BlockFlavourIdentifier(flavour),
-    config: builtinToolbarConfig,
-  }),
 ].flat();
 
 export const EdgelessNoteBlockSpec: ExtensionType[] = [
@@ -33,8 +23,4 @@ export const EdgelessNoteBlockSpec: ExtensionType[] = [
   NoteBlockService,
   BlockViewExtension(flavour, literal`affine-edgeless-note`),
   EdgelessNoteBlockAdapterExtensions,
-  ToolbarModuleExtension({
-    id: BlockFlavourIdentifier(flavour),
-    config: builtinToolbarConfig,
-  }),
 ].flat();

blocksuite/affine/block-root/src/common-specs/index.ts

@@ -1,20 +1,26 @@
 import { FileDropExtension } from '@blocksuite/affine-components/drop-indicator';
+import { NoteBlockSchema } from '@blocksuite/affine-model';
 import {
   DNDAPIExtension,
   DocModeService,
   EmbedOptionService,
   PageViewportServiceExtension,
   ThemeService,
+  ToolbarModuleExtension,
   ToolbarRegistryExtension,
 } from '@blocksuite/affine-shared/services';
 import { dragHandleWidget } from '@blocksuite/affine-widget-drag-handle';
 import { docRemoteSelectionWidget } from '@blocksuite/affine-widget-remote-selection';
 import { scrollAnchoringWidget } from '@blocksuite/affine-widget-scroll-anchoring';
 import { toolbarWidget } from '@blocksuite/affine-widget-toolbar';
-import { FlavourExtension } from '@blocksuite/block-std';
+import {
+  BlockFlavourIdentifier,
+  FlavourExtension,
+} from '@blocksuite/block-std';
 import type { ExtensionType } from '@blocksuite/store';
 
 import { RootBlockAdapterExtensions } from '../adapters/extension';
+import { builtinToolbarConfig } from '../configs/toolbar';
 import {
   innerModalWidget,
   linkedDocWidget,
@@ -43,6 +49,11 @@ export const CommonSpecs: ExtensionType[] = [
   viewportOverlayWidget,
   scrollAnchoringWidget,
   toolbarWidget,
+
+  ToolbarModuleExtension({
+    id: BlockFlavourIdentifier(NoteBlockSchema.model.flavour),
+    config: builtinToolbarConfig,
+  }),
 ];
 
 export * from './widgets';

blocksuite/affine/block-root/src/configs/toolbar.ts

@@ -8,6 +8,7 @@ import {
   notifyDocCreated,
   promptDocTitle,
 } from '@blocksuite/affine-block-embed';
+import { updateBlockType } from '@blocksuite/affine-block-note';
 import {
   deleteTextCommand,
   formatBlockCommand,
@@ -51,8 +52,6 @@ import { toDraftModel } from '@blocksuite/store';
 import { html } from 'lit';
 import { repeat } from 'lit/directives/repeat.js';
 
-import { updateBlockType } from '../commands';
-
 const conversionsActionGroup = {
   id: 'a.conversions',
   when: ({ chain }) => isFormatSupported(chain).run()[0],
@@ -161,7 +160,7 @@ const highlightActionGroup = {
   },
 } as const satisfies ToolbarAction;
 
-export const turnIntoDatabase = {
+const turnIntoDatabase = {
   id: 'd.convert-to-database',
   tooltip: 'Create Table',
   icon: DatabaseTableViewIcon(),
@@ -208,7 +207,7 @@ export const turnIntoDatabase = {
   },
 } as const satisfies ToolbarAction;
 
-export const turnIntoLinkedDoc = {
+const turnIntoLinkedDoc = {
   id: 'e.convert-to-linked-doc',
   tooltip: 'Create Linked Doc',
   icon: LinkedPageIcon(),

blocksuite/affine/block-root/tsconfig.json

@@ -30,6 +30,7 @@
     { "path": "../widget-frame-title" },
     { "path": "../widget-remote-selection" },
     { "path": "../widget-scroll-anchoring" },
+    { "path": "../widget-toolbar" },
     { "path": "../../framework/block-std" },
     { "path": "../data-view" },
     { "path": "../../framework/global" },

blocksuite/affine/widget-toolbar/tsconfig.json

@@ -7,11 +7,12 @@
   },
   "include": ["./src"],
   "references": [
+    { "path": "../block-database" },
+    { "path": "../block-table" },
     { "path": "../components" },
     { "path": "../model" },
     { "path": "../shared" },
     { "path": "../../framework/block-std" },
-    { "path": "../data-view" },
     { "path": "../../framework/global" }
   ]
 }