From f778d1a28a9f8d15868a2157699b29d5acc1d077 Mon Sep 17 00:00:00 2001 From: Saul-Mirone Date: Mon, 6 Jan 2025 15:15:14 +0000 Subject: [PATCH] refactor(editor): move extension to store (#9552) --- .../affine/block-attachment/src/attachment-spec.ts | 7 ++----- blocksuite/affine/block-attachment/src/embed.ts | 4 ++-- .../affine/block-bookmark/src/adapters/extension.ts | 2 +- blocksuite/affine/block-bookmark/src/bookmark-spec.ts | 2 +- blocksuite/affine/block-code/src/adapters/extension.ts | 2 +- blocksuite/affine/block-code/src/code-block-spec.ts | 2 +- blocksuite/affine/block-data-view/src/data-view-spec.ts | 7 ++----- .../affine/block-database/src/adapters/extension.ts | 2 +- blocksuite/affine/block-database/src/database-spec.ts | 2 +- .../affine/block-divider/src/adapters/extension.ts | 2 +- blocksuite/affine/block-divider/src/divider-spec.ts | 3 ++- .../affine/block-edgeless-text/src/edgeless-text-spec.ts | 7 ++----- .../src/embed-figma-block/adapters/extension.ts | 2 +- .../src/embed-figma-block/embed-figma-spec.ts | 7 ++----- .../src/embed-github-block/adapters/extension.ts | 2 +- .../src/embed-github-block/embed-github-spec.ts | 7 ++----- .../block-embed/src/embed-html-block/embed-html-spec.ts | 3 ++- .../src/embed-linked-doc-block/adapters/extension.ts | 2 +- .../embed-linked-doc-block/embed-linked-doc-config.ts | 3 ++- .../src/embed-linked-doc-block/embed-linked-doc-spec.ts | 7 ++----- .../src/embed-loom-block/adapters/extension.ts | 2 +- .../block-embed/src/embed-loom-block/embed-loom-spec.ts | 7 ++----- .../src/embed-synced-doc-block/adapters/extension.ts | 2 +- .../src/embed-synced-doc-block/embed-synced-doc-spec.ts | 7 ++----- .../src/embed-youtube-block/adapters/extension.ts | 2 +- .../src/embed-youtube-block/embed-youtube-spec.ts | 7 ++----- blocksuite/affine/block-embed/src/index.ts | 2 +- blocksuite/affine/block-frame/src/frame-spec.ts | 3 ++- blocksuite/affine/block-image/src/adapters/extension.ts | 2 +- blocksuite/affine/block-image/src/image-spec.ts | 2 +- blocksuite/affine/block-latex/src/adapters/extension.ts | 2 +- blocksuite/affine/block-latex/src/latex-spec.ts | 7 ++----- blocksuite/affine/block-list/src/adapters/extension.ts | 2 +- blocksuite/affine/block-list/src/list-spec.ts | 2 +- blocksuite/affine/block-note/src/adapters/index.ts | 2 +- blocksuite/affine/block-note/src/note-spec.ts | 2 +- .../affine/block-paragraph/src/adapters/extension.ts | 2 +- blocksuite/affine/block-paragraph/src/paragraph-spec.ts | 2 +- .../affine/block-surface-ref/src/surface-ref-spec.ts | 2 +- .../src/adapters/plain-text/element-adapter/type.ts | 2 +- .../block-surface/src/extensions/crud-extension.ts | 8 ++------ .../src/extensions/legacy-slot-extension.ts | 2 +- blocksuite/affine/block-surface/src/renderer/overlay.ts | 2 +- blocksuite/affine/block-surface/src/surface-spec.ts | 2 +- .../components/src/drag-indicator/file-drop-manager.ts | 3 +-- blocksuite/affine/components/src/peek/service.ts | 2 +- .../affine/components/src/rich-text/all-extensions.ts | 2 +- .../components/src/rich-text/extension/inline-manager.ts | 7 ++----- .../components/src/rich-text/extension/inline-spec.ts | 2 +- .../src/rich-text/extension/markdown-matcher.ts | 2 +- .../components/src/rich-text/extension/ref-node-slots.ts | 2 +- .../components/src/rich-text/inline/presets/markdown.ts | 3 ++- .../presets/nodes/reference-node/reference-config.ts | 3 ++- blocksuite/affine/shared/src/adapters/attachment.ts | 2 +- .../affine/shared/src/adapters/html/block-adapter.ts | 2 +- .../affine/shared/src/adapters/html/delta-converter.ts | 2 +- blocksuite/affine/shared/src/adapters/html/html.ts | 2 +- blocksuite/affine/shared/src/adapters/image.ts | 2 +- .../affine/shared/src/adapters/markdown/block-adapter.ts | 2 +- .../shared/src/adapters/markdown/delta-converter.ts | 2 +- .../affine/shared/src/adapters/markdown/markdown.ts | 2 +- .../shared/src/adapters/notion-html/block-adapter.ts | 2 +- .../shared/src/adapters/notion-html/delta-converter.ts | 2 +- .../shared/src/adapters/notion-html/notion-html.ts | 2 +- blocksuite/affine/shared/src/adapters/notion-text.ts | 2 +- .../shared/src/adapters/plain-text/block-adapter.ts | 2 +- .../shared/src/adapters/plain-text/delta-converter.ts | 2 +- .../affine/shared/src/adapters/plain-text/plain-text.ts | 2 +- .../affine/shared/src/services/doc-mode-service.ts | 4 ++-- .../affine/shared/src/services/drag-handle-config.ts | 8 ++------ .../affine/shared/src/services/editor-setting-service.ts | 2 +- .../affine/shared/src/services/embed-option-service.ts | 2 +- .../src/services/font-loader/font-loader-service.ts | 3 ++- .../affine/shared/src/services/generate-url-service.ts | 2 +- .../affine/shared/src/services/notification-service.ts | 2 +- .../affine/shared/src/services/page-viewport-service.ts | 2 +- .../affine/shared/src/services/parse-url-service.ts | 2 +- .../affine/shared/src/services/quick-search-service.ts | 2 +- blocksuite/affine/shared/src/services/theme-service.ts | 8 ++------ blocksuite/affine/shared/src/utils/spec/spec-builder.ts | 2 +- blocksuite/affine/shared/src/utils/spec/spec-provider.ts | 2 +- blocksuite/blocks/src/_common/adapters/extension.ts | 2 +- blocksuite/blocks/src/_common/adapters/mix-text.ts | 2 +- .../src/_common/adapters/notion-html/block-matcher.ts | 2 +- .../adapters/notion-html/delta-converter/html-inline.ts | 2 +- .../src/_common/adapters/plain-text/block-matcher.ts | 2 +- .../adapters/plain-text/delta-converter/inline-delta.ts | 2 +- .../blocks/src/_common/export-manager/export-manager.ts | 3 +-- blocksuite/blocks/src/_specs/common.ts | 2 +- blocksuite/blocks/src/_specs/preset/edgeless-specs.ts | 2 +- blocksuite/blocks/src/_specs/preset/page-specs.ts | 2 +- blocksuite/blocks/src/_specs/preset/preview-specs.ts | 2 +- blocksuite/blocks/src/root-block/adapters/extension.ts | 2 +- .../blocks/src/root-block/edgeless/edgeless-root-spec.ts | 2 +- blocksuite/blocks/src/root-block/page/page-root-spec.ts | 2 +- .../blocks/src/root-block/preview/preview-root-spec.ts | 7 ++----- .../framework/block-std/src/__tests__/test-editor.ts | 3 +-- .../framework/block-std/src/__tests__/test-spec.ts | 3 ++- .../framework/block-std/src/extension/block-view.ts | 3 ++- blocksuite/framework/block-std/src/extension/command.ts | 3 ++- blocksuite/framework/block-std/src/extension/config.ts | 3 ++- blocksuite/framework/block-std/src/extension/flavour.ts | 3 ++- blocksuite/framework/block-std/src/extension/index.ts | 1 - blocksuite/framework/block-std/src/extension/keymap.ts | 3 ++- .../block-std/src/extension/lifecycle-watcher.ts | 2 +- .../framework/block-std/src/extension/selection.ts | 3 ++- blocksuite/framework/block-std/src/extension/service.ts | 2 +- .../framework/block-std/src/extension/widget-view-map.ts | 3 ++- blocksuite/framework/block-std/src/gfx/extension.ts | 2 +- .../framework/block-std/src/gfx/surface-middleware.ts | 2 +- blocksuite/framework/block-std/src/gfx/tool/tool.ts | 2 +- blocksuite/framework/block-std/src/gfx/view/view.ts | 2 +- .../framework/block-std/src/scope/block-std-scope.ts | 9 +++++++-- .../extension.ts => store/src/extension/index.ts} | 0 blocksuite/framework/store/src/index.ts | 1 + blocksuite/presets/src/editors/editor-container.ts | 8 ++------ .../presets/_common/components/text-renderer.ts | 2 +- .../src/blocksuite/presets/_common/utils/custom-specs.ts | 6 ++---- .../frontend/core/src/blocksuite/presets/ai/ai-spec.ts | 2 +- .../core/src/blocksuite/presets/ai/mini-mindmap/spec.ts | 3 +-- .../presets/blocks/ai-chat-block/ai-chat-spec.ts | 6 ++---- .../blocksuite/block-suite-editor/specs/common.ts | 2 +- .../block-suite-editor/specs/custom/root-block.ts | 2 +- .../block-suite-editor/specs/custom/spec-patchers.tsx | 7 +++++-- .../blocksuite/block-suite-editor/specs/edgeless.ts | 2 +- .../blocksuite/block-suite-editor/specs/page.ts | 2 +- .../blocksuite/block-suite-editor/specs/preview.ts | 2 +- 127 files changed, 170 insertions(+), 207 deletions(-) rename blocksuite/framework/{block-std/src/extension/extension.ts => store/src/extension/index.ts} (100%) diff --git a/blocksuite/affine/block-attachment/src/attachment-spec.ts b/blocksuite/affine/block-attachment/src/attachment-spec.ts index 338be2045d..fed3db5d08 100644 --- a/blocksuite/affine/block-attachment/src/attachment-spec.ts +++ b/blocksuite/affine/block-attachment/src/attachment-spec.ts @@ -1,8 +1,5 @@ -import { - BlockViewExtension, - type ExtensionType, - 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'; import { AttachmentBlockNotionHtmlAdapterExtension } from './adapters/notion-html.js'; diff --git a/blocksuite/affine/block-attachment/src/embed.ts b/blocksuite/affine/block-attachment/src/embed.ts index b1e4652dfc..1053619240 100644 --- a/blocksuite/affine/block-attachment/src/embed.ts +++ b/blocksuite/affine/block-attachment/src/embed.ts @@ -6,10 +6,10 @@ import { transformModel, withTempBlobData, } from '@blocksuite/affine-shared/utils'; -import type { ExtensionType } from '@blocksuite/block-std'; -import { Extension } from '@blocksuite/block-std'; import type { Container } from '@blocksuite/global/di'; import { createIdentifier } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; +import { Extension } from '@blocksuite/store'; import type { TemplateResult } from 'lit'; import { html } from 'lit'; diff --git a/blocksuite/affine/block-bookmark/src/adapters/extension.ts b/blocksuite/affine/block-bookmark/src/adapters/extension.ts index 41b0f9a52d..6f784e0284 100644 --- a/blocksuite/affine/block-bookmark/src/adapters/extension.ts +++ b/blocksuite/affine/block-bookmark/src/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { BookmarkBlockHtmlAdapterExtension } from './html.js'; import { BookmarkBlockMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-bookmark/src/bookmark-spec.ts b/blocksuite/affine/block-bookmark/src/bookmark-spec.ts index 0285d44218..9b2ef554a1 100644 --- a/blocksuite/affine/block-bookmark/src/bookmark-spec.ts +++ b/blocksuite/affine/block-bookmark/src/bookmark-spec.ts @@ -1,9 +1,9 @@ import { BlockViewExtension, CommandExtension, - type ExtensionType, FlavourExtension, } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { BookmarkBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-code/src/adapters/extension.ts b/blocksuite/affine/block-code/src/adapters/extension.ts index b93faadad8..9006ac28f0 100644 --- a/blocksuite/affine/block-code/src/adapters/extension.ts +++ b/blocksuite/affine/block-code/src/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { CodeBlockHtmlAdapterExtension } from './html.js'; import { CodeBlockMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-code/src/code-block-spec.ts b/blocksuite/affine/block-code/src/code-block-spec.ts index ea1dcc0aec..5ddb5da56f 100644 --- a/blocksuite/affine/block-code/src/code-block-spec.ts +++ b/blocksuite/affine/block-code/src/code-block-spec.ts @@ -1,9 +1,9 @@ import { BlockViewExtension, - type ExtensionType, FlavourExtension, WidgetViewMapExtension, } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal, unsafeStatic } from 'lit/static-html.js'; import { CodeBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-data-view/src/data-view-spec.ts b/blocksuite/affine/block-data-view/src/data-view-spec.ts index e0a9aceebc..d28dbb87dc 100644 --- a/blocksuite/affine/block-data-view/src/data-view-spec.ts +++ b/blocksuite/affine/block-data-view/src/data-view-spec.ts @@ -1,8 +1,5 @@ -import { - BlockViewExtension, - type ExtensionType, - 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'; export const DataViewBlockSpec: ExtensionType[] = [ diff --git a/blocksuite/affine/block-database/src/adapters/extension.ts b/blocksuite/affine/block-database/src/adapters/extension.ts index 3fc5acda39..cdcc473925 100644 --- a/blocksuite/affine/block-database/src/adapters/extension.ts +++ b/blocksuite/affine/block-database/src/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { DatabaseBlockHtmlAdapterExtension } from './html.js'; import { DatabaseBlockMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-database/src/database-spec.ts b/blocksuite/affine/block-database/src/database-spec.ts index 245bf1a18a..86edb47ce6 100644 --- a/blocksuite/affine/block-database/src/database-spec.ts +++ b/blocksuite/affine/block-database/src/database-spec.ts @@ -1,10 +1,10 @@ import { BlockViewExtension, CommandExtension, - type ExtensionType, FlavourExtension, } from '@blocksuite/block-std'; import { DatabaseSelectionExtension } from '@blocksuite/data-view'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { DatabaseBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-divider/src/adapters/extension.ts b/blocksuite/affine/block-divider/src/adapters/extension.ts index 83e73de96f..36427abed3 100644 --- a/blocksuite/affine/block-divider/src/adapters/extension.ts +++ b/blocksuite/affine/block-divider/src/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { DividerBlockHtmlAdapterExtension } from './html.js'; import { DividerBlockMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-divider/src/divider-spec.ts b/blocksuite/affine/block-divider/src/divider-spec.ts index ca2f50352e..a5b9949e06 100644 --- a/blocksuite/affine/block-divider/src/divider-spec.ts +++ b/blocksuite/affine/block-divider/src/divider-spec.ts @@ -1,4 +1,5 @@ -import { BlockViewExtension, type ExtensionType } from '@blocksuite/block-std'; +import { BlockViewExtension } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { DividerBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-edgeless-text/src/edgeless-text-spec.ts b/blocksuite/affine/block-edgeless-text/src/edgeless-text-spec.ts index 71b2e590f6..1859eb92b5 100644 --- a/blocksuite/affine/block-edgeless-text/src/edgeless-text-spec.ts +++ b/blocksuite/affine/block-edgeless-text/src/edgeless-text-spec.ts @@ -1,8 +1,5 @@ -import { - BlockViewExtension, - CommandExtension, - type ExtensionType, -} from '@blocksuite/block-std'; +import { BlockViewExtension, CommandExtension } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { commands } from './commands/index.js'; diff --git a/blocksuite/affine/block-embed/src/embed-figma-block/adapters/extension.ts b/blocksuite/affine/block-embed/src/embed-figma-block/adapters/extension.ts index 7c6917be7a..d003c61cb4 100644 --- a/blocksuite/affine/block-embed/src/embed-figma-block/adapters/extension.ts +++ b/blocksuite/affine/block-embed/src/embed-figma-block/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { EmbedFigmaBlockHtmlAdapterExtension } from './html.js'; import { EmbedFigmaMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-embed/src/embed-figma-block/embed-figma-spec.ts b/blocksuite/affine/block-embed/src/embed-figma-block/embed-figma-spec.ts index 9165e699a4..7aab6f8b20 100644 --- a/blocksuite/affine/block-embed/src/embed-figma-block/embed-figma-spec.ts +++ b/blocksuite/affine/block-embed/src/embed-figma-block/embed-figma-spec.ts @@ -1,8 +1,5 @@ -import { - BlockViewExtension, - type ExtensionType, - 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'; import { EmbedFigmaBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-embed/src/embed-github-block/adapters/extension.ts b/blocksuite/affine/block-embed/src/embed-github-block/adapters/extension.ts index 586b0d5d8f..166adf429a 100644 --- a/blocksuite/affine/block-embed/src/embed-github-block/adapters/extension.ts +++ b/blocksuite/affine/block-embed/src/embed-github-block/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { EmbedGithubBlockHtmlAdapterExtension } from './html.js'; import { EmbedGithubMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-embed/src/embed-github-block/embed-github-spec.ts b/blocksuite/affine/block-embed/src/embed-github-block/embed-github-spec.ts index 44045362d8..ac8834d225 100644 --- a/blocksuite/affine/block-embed/src/embed-github-block/embed-github-spec.ts +++ b/blocksuite/affine/block-embed/src/embed-github-block/embed-github-spec.ts @@ -1,8 +1,5 @@ -import { - BlockViewExtension, - type ExtensionType, - 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'; import { EmbedGithubBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-embed/src/embed-html-block/embed-html-spec.ts b/blocksuite/affine/block-embed/src/embed-html-block/embed-html-spec.ts index 3ae016592f..8f9d6bd5d9 100644 --- a/blocksuite/affine/block-embed/src/embed-html-block/embed-html-spec.ts +++ b/blocksuite/affine/block-embed/src/embed-html-block/embed-html-spec.ts @@ -1,4 +1,5 @@ -import { BlockViewExtension, type ExtensionType } from '@blocksuite/block-std'; +import { BlockViewExtension } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; export const EmbedHtmlBlockSpec: ExtensionType[] = [ diff --git a/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/extension.ts b/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/extension.ts index 5f75ffafe9..b002ed991a 100644 --- a/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/extension.ts +++ b/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { EmbedLinkedDocHtmlAdapterExtension } from './html.js'; import { EmbedLinkedDocMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-config.ts b/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-config.ts index bf3202fe3e..dd2dd4c5e2 100644 --- a/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-config.ts +++ b/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-config.ts @@ -1,6 +1,7 @@ import type { ReferenceInfo } from '@blocksuite/affine-model'; -import type { EditorHost, ExtensionType } from '@blocksuite/block-std'; +import type { EditorHost } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; export interface EmbedLinkedDocBlockConfig { handleClick?: ( diff --git a/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-spec.ts b/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-spec.ts index 70d4f4256b..78d17fb51d 100644 --- a/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-spec.ts +++ b/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-spec.ts @@ -1,8 +1,5 @@ -import { - BlockViewExtension, - CommandExtension, - type ExtensionType, -} from '@blocksuite/block-std'; +import { BlockViewExtension, CommandExtension } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { EmbedLinkedDocBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-embed/src/embed-loom-block/adapters/extension.ts b/blocksuite/affine/block-embed/src/embed-loom-block/adapters/extension.ts index 99be14e2ad..8a97920450 100644 --- a/blocksuite/affine/block-embed/src/embed-loom-block/adapters/extension.ts +++ b/blocksuite/affine/block-embed/src/embed-loom-block/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { EmbedLoomBlockHtmlAdapterExtension } from './html.js'; import { EmbedLoomMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-embed/src/embed-loom-block/embed-loom-spec.ts b/blocksuite/affine/block-embed/src/embed-loom-block/embed-loom-spec.ts index 4752629d1b..0d873ad41a 100644 --- a/blocksuite/affine/block-embed/src/embed-loom-block/embed-loom-spec.ts +++ b/blocksuite/affine/block-embed/src/embed-loom-block/embed-loom-spec.ts @@ -1,8 +1,5 @@ -import { - BlockViewExtension, - type ExtensionType, - 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'; import { EmbedLoomBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-embed/src/embed-synced-doc-block/adapters/extension.ts b/blocksuite/affine/block-embed/src/embed-synced-doc-block/adapters/extension.ts index 6b85f99592..f6b71087b1 100644 --- a/blocksuite/affine/block-embed/src/embed-synced-doc-block/adapters/extension.ts +++ b/blocksuite/affine/block-embed/src/embed-synced-doc-block/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { EmbedSyncedDocBlockHtmlAdapterExtension } from './html.js'; import { EmbedSyncedDocMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts b/blocksuite/affine/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts index e82625ef30..13b951488c 100644 --- a/blocksuite/affine/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts +++ b/blocksuite/affine/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts @@ -1,8 +1,5 @@ -import { - BlockViewExtension, - type ExtensionType, - 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'; import { EmbedSyncedDocBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-embed/src/embed-youtube-block/adapters/extension.ts b/blocksuite/affine/block-embed/src/embed-youtube-block/adapters/extension.ts index f6acd32d17..eb94a360f3 100644 --- a/blocksuite/affine/block-embed/src/embed-youtube-block/adapters/extension.ts +++ b/blocksuite/affine/block-embed/src/embed-youtube-block/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { EmbedYoutubeBlockHtmlAdapterExtension } from './html.js'; import { EmbedYoutubeMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-embed/src/embed-youtube-block/embed-youtube-spec.ts b/blocksuite/affine/block-embed/src/embed-youtube-block/embed-youtube-spec.ts index f18387cb86..a306c2fc37 100644 --- a/blocksuite/affine/block-embed/src/embed-youtube-block/embed-youtube-spec.ts +++ b/blocksuite/affine/block-embed/src/embed-youtube-block/embed-youtube-spec.ts @@ -1,8 +1,5 @@ -import { - BlockViewExtension, - type ExtensionType, - 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'; import { EmbedYoutubeBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-embed/src/index.ts b/blocksuite/affine/block-embed/src/index.ts index b1131184bd..57019e6957 100644 --- a/blocksuite/affine/block-embed/src/index.ts +++ b/blocksuite/affine/block-embed/src/index.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { EmbedFigmaBlockSpec } from './embed-figma-block'; import { EmbedGithubBlockSpec } from './embed-github-block'; diff --git a/blocksuite/affine/block-frame/src/frame-spec.ts b/blocksuite/affine/block-frame/src/frame-spec.ts index 563a6cdde4..bc515690ce 100644 --- a/blocksuite/affine/block-frame/src/frame-spec.ts +++ b/blocksuite/affine/block-frame/src/frame-spec.ts @@ -1,4 +1,5 @@ -import { BlockViewExtension, type ExtensionType } from '@blocksuite/block-std'; +import { BlockViewExtension } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; export const FrameBlockSpec: ExtensionType[] = [ diff --git a/blocksuite/affine/block-image/src/adapters/extension.ts b/blocksuite/affine/block-image/src/adapters/extension.ts index bdfd0cc782..31d65f889e 100644 --- a/blocksuite/affine/block-image/src/adapters/extension.ts +++ b/blocksuite/affine/block-image/src/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { ImageBlockHtmlAdapterExtension } from './html.js'; import { ImageBlockMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-image/src/image-spec.ts b/blocksuite/affine/block-image/src/image-spec.ts index a51d94541f..92068953a3 100644 --- a/blocksuite/affine/block-image/src/image-spec.ts +++ b/blocksuite/affine/block-image/src/image-spec.ts @@ -2,10 +2,10 @@ import { ImageSelectionExtension } from '@blocksuite/affine-shared/selection'; import { BlockViewExtension, CommandExtension, - type ExtensionType, FlavourExtension, WidgetViewMapExtension, } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { ImageBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-latex/src/adapters/extension.ts b/blocksuite/affine/block-latex/src/adapters/extension.ts index 353f255bab..7e7ca335a2 100644 --- a/blocksuite/affine/block-latex/src/adapters/extension.ts +++ b/blocksuite/affine/block-latex/src/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { LatexBlockMarkdownAdapterExtension } from './markdown.js'; import { LatexBlockNotionHtmlAdapterExtension } from './notion-html.js'; diff --git a/blocksuite/affine/block-latex/src/latex-spec.ts b/blocksuite/affine/block-latex/src/latex-spec.ts index 0d15e6a705..a0fb635670 100644 --- a/blocksuite/affine/block-latex/src/latex-spec.ts +++ b/blocksuite/affine/block-latex/src/latex-spec.ts @@ -1,8 +1,5 @@ -import { - BlockViewExtension, - CommandExtension, - type ExtensionType, -} from '@blocksuite/block-std'; +import { BlockViewExtension, CommandExtension } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { LatexBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-list/src/adapters/extension.ts b/blocksuite/affine/block-list/src/adapters/extension.ts index 3dc1f0f5d5..be9253e37a 100644 --- a/blocksuite/affine/block-list/src/adapters/extension.ts +++ b/blocksuite/affine/block-list/src/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { ListBlockHtmlAdapterExtension } from './html.js'; import { ListBlockMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-list/src/list-spec.ts b/blocksuite/affine/block-list/src/list-spec.ts index 7d4fbafdba..421d49be53 100644 --- a/blocksuite/affine/block-list/src/list-spec.ts +++ b/blocksuite/affine/block-list/src/list-spec.ts @@ -1,9 +1,9 @@ import { BlockViewExtension, CommandExtension, - type ExtensionType, FlavourExtension, } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { ListBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-note/src/adapters/index.ts b/blocksuite/affine/block-note/src/adapters/index.ts index d867970295..11801748b6 100644 --- a/blocksuite/affine/block-note/src/adapters/index.ts +++ b/blocksuite/affine/block-note/src/adapters/index.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { DocNoteBlockHtmlAdapterExtension, diff --git a/blocksuite/affine/block-note/src/note-spec.ts b/blocksuite/affine/block-note/src/note-spec.ts index 96f91f26a4..d429d2358a 100644 --- a/blocksuite/affine/block-note/src/note-spec.ts +++ b/blocksuite/affine/block-note/src/note-spec.ts @@ -1,9 +1,9 @@ import { BlockViewExtension, CommandExtension, - type ExtensionType, FlavourExtension, } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { diff --git a/blocksuite/affine/block-paragraph/src/adapters/extension.ts b/blocksuite/affine/block-paragraph/src/adapters/extension.ts index 80c8cf65a2..1a4359eeb6 100644 --- a/blocksuite/affine/block-paragraph/src/adapters/extension.ts +++ b/blocksuite/affine/block-paragraph/src/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { ParagraphBlockHtmlAdapterExtension } from './html.js'; import { ParagraphBlockMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/affine/block-paragraph/src/paragraph-spec.ts b/blocksuite/affine/block-paragraph/src/paragraph-spec.ts index 48a4530630..8fcc215a4f 100644 --- a/blocksuite/affine/block-paragraph/src/paragraph-spec.ts +++ b/blocksuite/affine/block-paragraph/src/paragraph-spec.ts @@ -1,9 +1,9 @@ import { BlockViewExtension, CommandExtension, - type ExtensionType, FlavourExtension, } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { ParagraphBlockAdapterExtensions } from './adapters/extension.js'; diff --git a/blocksuite/affine/block-surface-ref/src/surface-ref-spec.ts b/blocksuite/affine/block-surface-ref/src/surface-ref-spec.ts index b0394351d3..95a0443dd4 100644 --- a/blocksuite/affine/block-surface-ref/src/surface-ref-spec.ts +++ b/blocksuite/affine/block-surface-ref/src/surface-ref-spec.ts @@ -1,10 +1,10 @@ import { BlockViewExtension, CommandExtension, - type ExtensionType, FlavourExtension, WidgetViewMapExtension, } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { commands } from './commands.js'; diff --git a/blocksuite/affine/block-surface/src/adapters/plain-text/element-adapter/type.ts b/blocksuite/affine/block-surface/src/adapters/plain-text/element-adapter/type.ts index 0e23f46acb..7b50637d5b 100644 --- a/blocksuite/affine/block-surface/src/adapters/plain-text/element-adapter/type.ts +++ b/blocksuite/affine/block-surface/src/adapters/plain-text/element-adapter/type.ts @@ -1,9 +1,9 @@ import type { TextBuffer } from '@blocksuite/affine-shared/adapters'; -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; import type { ElementModelMatcher } from '../../type.js'; diff --git a/blocksuite/affine/block-surface/src/extensions/crud-extension.ts b/blocksuite/affine/block-surface/src/extensions/crud-extension.ts index 5119dc7013..9ec43238c9 100644 --- a/blocksuite/affine/block-surface/src/extensions/crud-extension.ts +++ b/blocksuite/affine/block-surface/src/extensions/crud-extension.ts @@ -1,12 +1,8 @@ import { EditPropsStore } from '@blocksuite/affine-shared/services'; -import { - type BlockStdScope, - Extension, - StdIdentifier, -} from '@blocksuite/block-std'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx'; import { type Container, createIdentifier } from '@blocksuite/global/di'; -import type { BlockModel } from '@blocksuite/store'; +import { type BlockModel, Extension } from '@blocksuite/store'; import type { SurfaceBlockModel } from '../surface-model'; import { getLastPropsKey } from '../utils/get-last-props-key'; diff --git a/blocksuite/affine/block-surface/src/extensions/legacy-slot-extension.ts b/blocksuite/affine/block-surface/src/extensions/legacy-slot-extension.ts index df2e9d8ae2..5022b8ecdf 100644 --- a/blocksuite/affine/block-surface/src/extensions/legacy-slot-extension.ts +++ b/blocksuite/affine/block-surface/src/extensions/legacy-slot-extension.ts @@ -1,7 +1,7 @@ import type { FrameBlockModel } from '@blocksuite/affine-model'; -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; import { Slot } from '@blocksuite/global/utils'; +import type { ExtensionType } from '@blocksuite/store'; export const EdgelessLegacySlotIdentifier = createIdentifier<{ readonlyUpdated: Slot; diff --git a/blocksuite/affine/block-surface/src/renderer/overlay.ts b/blocksuite/affine/block-surface/src/renderer/overlay.ts index 63c5f3a30b..ff7c1192fc 100644 --- a/blocksuite/affine/block-surface/src/renderer/overlay.ts +++ b/blocksuite/affine/block-surface/src/renderer/overlay.ts @@ -1,10 +1,10 @@ -import { Extension } from '@blocksuite/block-std'; import { type GfxController, GfxControllerIdentifier, } from '@blocksuite/block-std/gfx'; import { type Container, createIdentifier } from '@blocksuite/global/di'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import { Extension } from '@blocksuite/store'; import type { RoughCanvas } from '../utils/rough/canvas.js'; import type { CanvasRenderer } from './canvas-renderer.js'; diff --git a/blocksuite/affine/block-surface/src/surface-spec.ts b/blocksuite/affine/block-surface/src/surface-spec.ts index 6013224a47..38e519cab4 100644 --- a/blocksuite/affine/block-surface/src/surface-spec.ts +++ b/blocksuite/affine/block-surface/src/surface-spec.ts @@ -2,9 +2,9 @@ import { HighlightSelectionExtension } from '@blocksuite/affine-shared/selection import { BlockViewExtension, CommandExtension, - type ExtensionType, FlavourExtension, } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; import { diff --git a/blocksuite/affine/components/src/drag-indicator/file-drop-manager.ts b/blocksuite/affine/components/src/drag-indicator/file-drop-manager.ts index 924481e11a..ef9e87abaa 100644 --- a/blocksuite/affine/components/src/drag-indicator/file-drop-manager.ts +++ b/blocksuite/affine/components/src/drag-indicator/file-drop-manager.ts @@ -8,13 +8,12 @@ import { import { type BlockStdScope, type EditorHost, - type ExtensionType, LifeCycleWatcher, } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; import type { IVec } from '@blocksuite/global/utils'; import { Point } from '@blocksuite/global/utils'; -import type { BlockModel } from '@blocksuite/store'; +import type { BlockModel, ExtensionType } from '@blocksuite/store'; import type { DragIndicator } from './index.js'; diff --git a/blocksuite/affine/components/src/peek/service.ts b/blocksuite/affine/components/src/peek/service.ts index 51e476c07d..9ef64a6c7e 100644 --- a/blocksuite/affine/components/src/peek/service.ts +++ b/blocksuite/affine/components/src/peek/service.ts @@ -1,5 +1,5 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; import type { PeekViewService } from './type.js'; diff --git a/blocksuite/affine/components/src/rich-text/all-extensions.ts b/blocksuite/affine/components/src/rich-text/all-extensions.ts index 8121a9d077..65ff46c2d5 100644 --- a/blocksuite/affine/components/src/rich-text/all-extensions.ts +++ b/blocksuite/affine/components/src/rich-text/all-extensions.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { InlineManagerExtension } from './extension/index.js'; import { diff --git a/blocksuite/affine/components/src/rich-text/extension/inline-manager.ts b/blocksuite/affine/components/src/rich-text/extension/inline-manager.ts index 4785a77246..f97cd3be46 100644 --- a/blocksuite/affine/components/src/rich-text/extension/inline-manager.ts +++ b/blocksuite/affine/components/src/rich-text/extension/inline-manager.ts @@ -1,9 +1,5 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import { - type BlockStdScope, - type ExtensionType, - StdIdentifier, -} from '@blocksuite/block-std'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, @@ -16,6 +12,7 @@ import { KEYBOARD_ALLOW_DEFAULT, type KeyboardBindingContext, } from '@blocksuite/inline'; +import type { ExtensionType } from '@blocksuite/store'; import type * as Y from 'yjs'; import { z, type ZodObject, type ZodTypeAny } from 'zod'; diff --git a/blocksuite/affine/components/src/rich-text/extension/inline-spec.ts b/blocksuite/affine/components/src/rich-text/extension/inline-spec.ts index 7b5aa824b9..cc291bd405 100644 --- a/blocksuite/affine/components/src/rich-text/extension/inline-spec.ts +++ b/blocksuite/affine/components/src/rich-text/extension/inline-spec.ts @@ -1,10 +1,10 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, type ServiceProvider, } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; import type { InlineSpecs } from './type.js'; diff --git a/blocksuite/affine/components/src/rich-text/extension/markdown-matcher.ts b/blocksuite/affine/components/src/rich-text/extension/markdown-matcher.ts index 9d88b90590..b63018537f 100644 --- a/blocksuite/affine/components/src/rich-text/extension/markdown-matcher.ts +++ b/blocksuite/affine/components/src/rich-text/extension/markdown-matcher.ts @@ -1,9 +1,9 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; import type { InlineMarkdownMatch } from './type.js'; diff --git a/blocksuite/affine/components/src/rich-text/extension/ref-node-slots.ts b/blocksuite/affine/components/src/rich-text/extension/ref-node-slots.ts index f637c51f8d..afec20cd12 100644 --- a/blocksuite/affine/components/src/rich-text/extension/ref-node-slots.ts +++ b/blocksuite/affine/components/src/rich-text/extension/ref-node-slots.ts @@ -1,6 +1,6 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; import { Slot } from '@blocksuite/global/utils'; +import type { ExtensionType } from '@blocksuite/store'; import type { RefNodeSlots } from '../inline/index.js'; diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/markdown.ts b/blocksuite/affine/components/src/rich-text/inline/presets/markdown.ts index 70e3e6cd09..5527d6c22d 100644 --- a/blocksuite/affine/components/src/rich-text/inline/presets/markdown.ts +++ b/blocksuite/affine/components/src/rich-text/inline/presets/markdown.ts @@ -1,8 +1,9 @@ -import type { BlockComponent, ExtensionType } from '@blocksuite/block-std'; +import type { BlockComponent } from '@blocksuite/block-std'; import { KEYBOARD_ALLOW_DEFAULT, KEYBOARD_PREVENT_DEFAULT, } from '@blocksuite/inline'; +import type { ExtensionType } from '@blocksuite/store'; import { InlineMarkdownExtension } from '../../extension/markdown-matcher.js'; diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-config.ts b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-config.ts index b4347c5038..3242b52152 100644 --- a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-config.ts +++ b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-config.ts @@ -1,5 +1,6 @@ -import type { BlockStdScope, ExtensionType } from '@blocksuite/block-std'; +import type { BlockStdScope } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; import type { TemplateResult } from 'lit'; import type { AffineReference } from './reference-node.js'; diff --git a/blocksuite/affine/shared/src/adapters/attachment.ts b/blocksuite/affine/shared/src/adapters/attachment.ts index 69eee2e442..4a6a82583e 100644 --- a/blocksuite/affine/shared/src/adapters/attachment.ts +++ b/blocksuite/affine/shared/src/adapters/attachment.ts @@ -1,4 +1,3 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import { sha } from '@blocksuite/global/utils'; import { @@ -6,6 +5,7 @@ import { BaseAdapter, type BlockSnapshot, type DocSnapshot, + type ExtensionType, type FromBlockSnapshotPayload, type FromBlockSnapshotResult, type FromDocSnapshotPayload, diff --git a/blocksuite/affine/shared/src/adapters/html/block-adapter.ts b/blocksuite/affine/shared/src/adapters/html/block-adapter.ts index 090c2d5c63..31f17088da 100644 --- a/blocksuite/affine/shared/src/adapters/html/block-adapter.ts +++ b/blocksuite/affine/shared/src/adapters/html/block-adapter.ts @@ -1,8 +1,8 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; import type { BlockAdapterMatcher } from '../types/adapter.js'; import type { HtmlAST } from '../types/hast.js'; diff --git a/blocksuite/affine/shared/src/adapters/html/delta-converter.ts b/blocksuite/affine/shared/src/adapters/html/delta-converter.ts index f4ee823208..02128f13bb 100644 --- a/blocksuite/affine/shared/src/adapters/html/delta-converter.ts +++ b/blocksuite/affine/shared/src/adapters/html/delta-converter.ts @@ -1,9 +1,9 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, } from '@blocksuite/global/di'; import type { DeltaInsert } from '@blocksuite/inline'; +import type { ExtensionType } from '@blocksuite/store'; import type { AffineTextAttributes } from '../../types/index.js'; import { diff --git a/blocksuite/affine/shared/src/adapters/html/html.ts b/blocksuite/affine/shared/src/adapters/html/html.ts index edaf350aa5..153f2079fa 100644 --- a/blocksuite/affine/shared/src/adapters/html/html.ts +++ b/blocksuite/affine/shared/src/adapters/html/html.ts @@ -1,5 +1,4 @@ import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model'; -import type { ExtensionType } from '@blocksuite/block-std'; import type { ServiceProvider } from '@blocksuite/global/di'; import { type AssetsManager, @@ -8,6 +7,7 @@ import { type BlockSnapshot, BlockSnapshotSchema, type DocSnapshot, + type ExtensionType, type FromBlockSnapshotPayload, type FromBlockSnapshotResult, type FromDocSnapshotPayload, diff --git a/blocksuite/affine/shared/src/adapters/image.ts b/blocksuite/affine/shared/src/adapters/image.ts index 655b8bb792..ed6761aca6 100644 --- a/blocksuite/affine/shared/src/adapters/image.ts +++ b/blocksuite/affine/shared/src/adapters/image.ts @@ -1,4 +1,3 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import { sha } from '@blocksuite/global/utils'; import { @@ -6,6 +5,7 @@ import { BaseAdapter, type BlockSnapshot, type DocSnapshot, + type ExtensionType, type FromBlockSnapshotPayload, type FromBlockSnapshotResult, type FromDocSnapshotPayload, diff --git a/blocksuite/affine/shared/src/adapters/markdown/block-adapter.ts b/blocksuite/affine/shared/src/adapters/markdown/block-adapter.ts index b34cee48ce..54070b87c5 100644 --- a/blocksuite/affine/shared/src/adapters/markdown/block-adapter.ts +++ b/blocksuite/affine/shared/src/adapters/markdown/block-adapter.ts @@ -1,8 +1,8 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; import type { BlockAdapterMatcher } from '../types/adapter.js'; import type { MarkdownDeltaConverter } from './delta-converter.js'; diff --git a/blocksuite/affine/shared/src/adapters/markdown/delta-converter.ts b/blocksuite/affine/shared/src/adapters/markdown/delta-converter.ts index e972903538..016e050db4 100644 --- a/blocksuite/affine/shared/src/adapters/markdown/delta-converter.ts +++ b/blocksuite/affine/shared/src/adapters/markdown/delta-converter.ts @@ -1,9 +1,9 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, } from '@blocksuite/global/di'; import type { DeltaInsert } from '@blocksuite/inline/types'; +import type { ExtensionType } from '@blocksuite/store'; import type { PhrasingContent } from 'mdast'; import type { AffineTextAttributes } from '../../types/index.js'; diff --git a/blocksuite/affine/shared/src/adapters/markdown/markdown.ts b/blocksuite/affine/shared/src/adapters/markdown/markdown.ts index ab149e968c..1baf7af3b1 100644 --- a/blocksuite/affine/shared/src/adapters/markdown/markdown.ts +++ b/blocksuite/affine/shared/src/adapters/markdown/markdown.ts @@ -1,5 +1,4 @@ import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model'; -import type { ExtensionType } from '@blocksuite/block-std'; import type { ServiceProvider } from '@blocksuite/global/di'; import { type AssetsManager, @@ -8,6 +7,7 @@ import { type BlockSnapshot, BlockSnapshotSchema, type DocSnapshot, + type ExtensionType, type FromBlockSnapshotPayload, type FromBlockSnapshotResult, type FromDocSnapshotPayload, diff --git a/blocksuite/affine/shared/src/adapters/notion-html/block-adapter.ts b/blocksuite/affine/shared/src/adapters/notion-html/block-adapter.ts index a11b06eb45..5e81137f87 100644 --- a/blocksuite/affine/shared/src/adapters/notion-html/block-adapter.ts +++ b/blocksuite/affine/shared/src/adapters/notion-html/block-adapter.ts @@ -1,8 +1,8 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; import type { BlockAdapterMatcher } from '../types/adapter.js'; import type { HtmlAST } from '../types/hast.js'; diff --git a/blocksuite/affine/shared/src/adapters/notion-html/delta-converter.ts b/blocksuite/affine/shared/src/adapters/notion-html/delta-converter.ts index 490b53787d..45d8ad28a7 100644 --- a/blocksuite/affine/shared/src/adapters/notion-html/delta-converter.ts +++ b/blocksuite/affine/shared/src/adapters/notion-html/delta-converter.ts @@ -1,10 +1,10 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, } from '@blocksuite/global/di'; import { isEqual } from '@blocksuite/global/utils'; import type { DeltaInsert } from '@blocksuite/inline'; +import type { ExtensionType } from '@blocksuite/store'; import type { AffineTextAttributes } from '../../types/index.js'; import { diff --git a/blocksuite/affine/shared/src/adapters/notion-html/notion-html.ts b/blocksuite/affine/shared/src/adapters/notion-html/notion-html.ts index 8b74ca2dbc..533f2dee12 100644 --- a/blocksuite/affine/shared/src/adapters/notion-html/notion-html.ts +++ b/blocksuite/affine/shared/src/adapters/notion-html/notion-html.ts @@ -1,5 +1,4 @@ import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model'; -import type { ExtensionType } from '@blocksuite/block-std'; import type { ServiceProvider } from '@blocksuite/global/di'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import { @@ -8,6 +7,7 @@ import { BaseAdapter, type BlockSnapshot, type DocSnapshot, + type ExtensionType, type FromBlockSnapshotPayload, type FromBlockSnapshotResult, type FromDocSnapshotPayload, diff --git a/blocksuite/affine/shared/src/adapters/notion-text.ts b/blocksuite/affine/shared/src/adapters/notion-text.ts index bcd24b355f..8aca8bf912 100644 --- a/blocksuite/affine/shared/src/adapters/notion-text.ts +++ b/blocksuite/affine/shared/src/adapters/notion-text.ts @@ -1,5 +1,4 @@ import { DefaultTheme } from '@blocksuite/affine-model'; -import type { ExtensionType } from '@blocksuite/block-std'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import type { DeltaInsert } from '@blocksuite/inline'; import { @@ -7,6 +6,7 @@ import { BaseAdapter, type BlockSnapshot, type DocSnapshot, + type ExtensionType, type FromBlockSnapshotResult, type FromDocSnapshotResult, type FromSliceSnapshotResult, diff --git a/blocksuite/affine/shared/src/adapters/plain-text/block-adapter.ts b/blocksuite/affine/shared/src/adapters/plain-text/block-adapter.ts index 8ea22ef8cd..a6887963f5 100644 --- a/blocksuite/affine/shared/src/adapters/plain-text/block-adapter.ts +++ b/blocksuite/affine/shared/src/adapters/plain-text/block-adapter.ts @@ -1,8 +1,8 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; import type { BlockAdapterMatcher, TextBuffer } from '../types/adapter.js'; diff --git a/blocksuite/affine/shared/src/adapters/plain-text/delta-converter.ts b/blocksuite/affine/shared/src/adapters/plain-text/delta-converter.ts index 5ede6bbeaf..c0d0604f8d 100644 --- a/blocksuite/affine/shared/src/adapters/plain-text/delta-converter.ts +++ b/blocksuite/affine/shared/src/adapters/plain-text/delta-converter.ts @@ -1,9 +1,9 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier, type ServiceIdentifier, } from '@blocksuite/global/di'; import type { DeltaInsert } from '@blocksuite/inline'; +import type { ExtensionType } from '@blocksuite/store'; import type { AffineTextAttributes } from '../../types/index.js'; import { diff --git a/blocksuite/affine/shared/src/adapters/plain-text/plain-text.ts b/blocksuite/affine/shared/src/adapters/plain-text/plain-text.ts index 57fc7fc08f..5168a04ba0 100644 --- a/blocksuite/affine/shared/src/adapters/plain-text/plain-text.ts +++ b/blocksuite/affine/shared/src/adapters/plain-text/plain-text.ts @@ -1,5 +1,4 @@ import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model'; -import type { ExtensionType } from '@blocksuite/block-std'; import type { ServiceProvider } from '@blocksuite/global/di'; import { type AssetsManager, @@ -8,6 +7,7 @@ import { type BlockSnapshot, BlockSnapshotSchema, type DocSnapshot, + type ExtensionType, type FromBlockSnapshotPayload, type FromBlockSnapshotResult, type FromDocSnapshotPayload, diff --git a/blocksuite/affine/shared/src/services/doc-mode-service.ts b/blocksuite/affine/shared/src/services/doc-mode-service.ts index cd3f1e0bea..3c786ce1dd 100644 --- a/blocksuite/affine/shared/src/services/doc-mode-service.ts +++ b/blocksuite/affine/shared/src/services/doc-mode-service.ts @@ -1,9 +1,9 @@ import type { DocMode } from '@blocksuite/affine-model'; -import type { ExtensionType } from '@blocksuite/block-std'; -import { Extension } from '@blocksuite/block-std'; import type { Container } from '@blocksuite/global/di'; import { createIdentifier } from '@blocksuite/global/di'; import { type Disposable, noop, Slot } from '@blocksuite/global/utils'; +import type { ExtensionType } from '@blocksuite/store'; +import { Extension } from '@blocksuite/store'; const DEFAULT_MODE: DocMode = 'page'; diff --git a/blocksuite/affine/shared/src/services/drag-handle-config.ts b/blocksuite/affine/shared/src/services/drag-handle-config.ts index 7cbafc5b1c..8f238c5595 100644 --- a/blocksuite/affine/shared/src/services/drag-handle-config.ts +++ b/blocksuite/affine/shared/src/services/drag-handle-config.ts @@ -1,10 +1,6 @@ -import { - type BlockStdScope, - Extension, - StdIdentifier, -} from '@blocksuite/block-std'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; import { type Container, createIdentifier } from '@blocksuite/global/di'; -import { Slice, type SliceSnapshot } from '@blocksuite/store'; +import { Extension, Slice, type SliceSnapshot } from '@blocksuite/store'; export const DndApiExtensionIdentifier = createIdentifier( 'AffineDndApiIdentifier' diff --git a/blocksuite/affine/shared/src/services/editor-setting-service.ts b/blocksuite/affine/shared/src/services/editor-setting-service.ts index aad75b750b..c8bdac55c5 100644 --- a/blocksuite/affine/shared/src/services/editor-setting-service.ts +++ b/blocksuite/affine/shared/src/services/editor-setting-service.ts @@ -1,6 +1,6 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; import type { DeepPartial } from '@blocksuite/global/utils'; +import type { ExtensionType } from '@blocksuite/store'; import type { Signal } from '@preact/signals-core'; import { z } from 'zod'; diff --git a/blocksuite/affine/shared/src/services/embed-option-service.ts b/blocksuite/affine/shared/src/services/embed-option-service.ts index 3762a99e21..aa02021619 100644 --- a/blocksuite/affine/shared/src/services/embed-option-service.ts +++ b/blocksuite/affine/shared/src/services/embed-option-service.ts @@ -1,7 +1,7 @@ import type { EmbedCardStyle } from '@blocksuite/affine-model'; -import { Extension } from '@blocksuite/block-std'; import type { Container } from '@blocksuite/global/di'; import { createIdentifier } from '@blocksuite/global/di'; +import { Extension } from '@blocksuite/store'; export type EmbedOptions = { flavour: string; diff --git a/blocksuite/affine/shared/src/services/font-loader/font-loader-service.ts b/blocksuite/affine/shared/src/services/font-loader/font-loader-service.ts index 01384c57c1..6e52b4e69a 100644 --- a/blocksuite/affine/shared/src/services/font-loader/font-loader-service.ts +++ b/blocksuite/affine/shared/src/services/font-loader/font-loader-service.ts @@ -1,6 +1,7 @@ -import { type ExtensionType, LifeCycleWatcher } from '@blocksuite/block-std'; +import { LifeCycleWatcher } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; import { IS_FIREFOX } from '@blocksuite/global/env'; +import type { ExtensionType } from '@blocksuite/store'; import type { FontConfig } from './config.js'; diff --git a/blocksuite/affine/shared/src/services/generate-url-service.ts b/blocksuite/affine/shared/src/services/generate-url-service.ts index b07d3298b4..8921fc49c6 100644 --- a/blocksuite/affine/shared/src/services/generate-url-service.ts +++ b/blocksuite/affine/shared/src/services/generate-url-service.ts @@ -1,6 +1,6 @@ import type { ReferenceParams } from '@blocksuite/affine-model'; -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; export interface GenerateDocUrlService { generateDocUrl: (docId: string, params?: ReferenceParams) => string | void; diff --git a/blocksuite/affine/shared/src/services/notification-service.ts b/blocksuite/affine/shared/src/services/notification-service.ts index f491c8936b..1da78e7395 100644 --- a/blocksuite/affine/shared/src/services/notification-service.ts +++ b/blocksuite/affine/shared/src/services/notification-service.ts @@ -1,5 +1,5 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; import type { TemplateResult } from 'lit'; export interface NotificationService { diff --git a/blocksuite/affine/shared/src/services/page-viewport-service.ts b/blocksuite/affine/shared/src/services/page-viewport-service.ts index 697d546b23..5e4734869c 100644 --- a/blocksuite/affine/shared/src/services/page-viewport-service.ts +++ b/blocksuite/affine/shared/src/services/page-viewport-service.ts @@ -1,6 +1,6 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; import { Slot } from '@blocksuite/global/utils'; +import type { ExtensionType } from '@blocksuite/store'; import type { Viewport } from '../types'; diff --git a/blocksuite/affine/shared/src/services/parse-url-service.ts b/blocksuite/affine/shared/src/services/parse-url-service.ts index 848b4f1d60..befbe1463b 100644 --- a/blocksuite/affine/shared/src/services/parse-url-service.ts +++ b/blocksuite/affine/shared/src/services/parse-url-service.ts @@ -1,6 +1,6 @@ import type { ReferenceParams } from '@blocksuite/affine-model'; -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; export interface ParseDocUrlService { parseDocUrl: ( diff --git a/blocksuite/affine/shared/src/services/quick-search-service.ts b/blocksuite/affine/shared/src/services/quick-search-service.ts index 49e67cbb53..11df69caa6 100644 --- a/blocksuite/affine/shared/src/services/quick-search-service.ts +++ b/blocksuite/affine/shared/src/services/quick-search-service.ts @@ -1,6 +1,6 @@ import type { ReferenceParams } from '@blocksuite/affine-model'; -import type { ExtensionType } from '@blocksuite/block-std'; import { createIdentifier } from '@blocksuite/global/di'; +import type { ExtensionType } from '@blocksuite/store'; export interface QuickSearchService { openQuickSearch: () => Promise; diff --git a/blocksuite/affine/shared/src/services/theme-service.ts b/blocksuite/affine/shared/src/services/theme-service.ts index 97c25dea9c..181c2c65c7 100644 --- a/blocksuite/affine/shared/src/services/theme-service.ts +++ b/blocksuite/affine/shared/src/services/theme-service.ts @@ -4,13 +4,9 @@ import { DefaultTheme, resolveColor, } from '@blocksuite/affine-model'; -import { - type BlockStdScope, - Extension, - type ExtensionType, - StdIdentifier, -} from '@blocksuite/block-std'; +import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std'; import { type Container, createIdentifier } from '@blocksuite/global/di'; +import { Extension, type ExtensionType } from '@blocksuite/store'; import { type Signal, signal } from '@preact/signals-core'; import { type AffineCssVariables, diff --git a/blocksuite/affine/shared/src/utils/spec/spec-builder.ts b/blocksuite/affine/shared/src/utils/spec/spec-builder.ts index 922acbacdd..bbe86d65c8 100644 --- a/blocksuite/affine/shared/src/utils/spec/spec-builder.ts +++ b/blocksuite/affine/shared/src/utils/spec/spec-builder.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; export class SpecBuilder { private _value: ExtensionType[]; diff --git a/blocksuite/affine/shared/src/utils/spec/spec-provider.ts b/blocksuite/affine/shared/src/utils/spec/spec-provider.ts index 4247e858a8..c0e9120a54 100644 --- a/blocksuite/affine/shared/src/utils/spec/spec-provider.ts +++ b/blocksuite/affine/shared/src/utils/spec/spec-provider.ts @@ -1,5 +1,5 @@ -import type { ExtensionType } from '@blocksuite/block-std'; import { assertExists } from '@blocksuite/global/utils'; +import type { ExtensionType } from '@blocksuite/store'; import { SpecBuilder } from './spec-builder.js'; diff --git a/blocksuite/blocks/src/_common/adapters/extension.ts b/blocksuite/blocks/src/_common/adapters/extension.ts index d0ec8c843a..60e6354404 100644 --- a/blocksuite/blocks/src/_common/adapters/extension.ts +++ b/blocksuite/blocks/src/_common/adapters/extension.ts @@ -7,7 +7,7 @@ import { NotionTextAdapterFactoryExtension, PlainTextAdapterFactoryExtension, } from '@blocksuite/affine-shared/adapters'; -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { htmlInlineToDeltaMatchers } from './html/delta-converter/html-inline.js'; import { inlineDeltaToHtmlAdapterMatchers } from './html/delta-converter/inline-delta.js'; diff --git a/blocksuite/blocks/src/_common/adapters/mix-text.ts b/blocksuite/blocks/src/_common/adapters/mix-text.ts index 23c2cd03f1..06f07f9dbf 100644 --- a/blocksuite/blocks/src/_common/adapters/mix-text.ts +++ b/blocksuite/blocks/src/_common/adapters/mix-text.ts @@ -3,7 +3,6 @@ import { AdapterFactoryIdentifier, MarkdownAdapter, } from '@blocksuite/affine-shared/adapters'; -import type { ExtensionType } from '@blocksuite/block-std'; import type { ServiceProvider } from '@blocksuite/global/di'; import type { DeltaInsert } from '@blocksuite/inline'; import { @@ -13,6 +12,7 @@ import { type BlockSnapshot, BlockSnapshotSchema, type DocSnapshot, + type ExtensionType, type FromBlockSnapshotPayload, type FromBlockSnapshotResult, type FromDocSnapshotPayload, diff --git a/blocksuite/blocks/src/_common/adapters/notion-html/block-matcher.ts b/blocksuite/blocks/src/_common/adapters/notion-html/block-matcher.ts index ffb787be1f..fe2e61bdc5 100644 --- a/blocksuite/blocks/src/_common/adapters/notion-html/block-matcher.ts +++ b/blocksuite/blocks/src/_common/adapters/notion-html/block-matcher.ts @@ -13,7 +13,7 @@ import { ImageBlockNotionHtmlAdapterExtension } from '@blocksuite/affine-block-i import { LatexBlockNotionHtmlAdapterExtension } from '@blocksuite/affine-block-latex'; import { ListBlockNotionHtmlAdapterExtension } from '@blocksuite/affine-block-list'; import { ParagraphBlockNotionHtmlAdapterExtension } from '@blocksuite/affine-block-paragraph'; -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { RootBlockNotionHtmlAdapterExtension } from '../../../root-block/adapters/notion-html.js'; diff --git a/blocksuite/blocks/src/_common/adapters/notion-html/delta-converter/html-inline.ts b/blocksuite/blocks/src/_common/adapters/notion-html/delta-converter/html-inline.ts index 3dfc151bf0..1ab3357745 100644 --- a/blocksuite/blocks/src/_common/adapters/notion-html/delta-converter/html-inline.ts +++ b/blocksuite/blocks/src/_common/adapters/notion-html/delta-converter/html-inline.ts @@ -3,7 +3,7 @@ import { type HtmlAST, NotionHtmlASTToDeltaExtension, } from '@blocksuite/affine-shared/adapters'; -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { collapseWhiteSpace } from 'collapse-white-space'; import type { Element, Text } from 'hast'; diff --git a/blocksuite/blocks/src/_common/adapters/plain-text/block-matcher.ts b/blocksuite/blocks/src/_common/adapters/plain-text/block-matcher.ts index 7b90d98ad3..f6faea8dd9 100644 --- a/blocksuite/blocks/src/_common/adapters/plain-text/block-matcher.ts +++ b/blocksuite/blocks/src/_common/adapters/plain-text/block-matcher.ts @@ -13,7 +13,7 @@ import { import { LatexBlockPlainTextAdapterExtension } from '@blocksuite/affine-block-latex'; import { ListBlockPlainTextAdapterExtension } from '@blocksuite/affine-block-list'; import { ParagraphBlockPlainTextAdapterExtension } from '@blocksuite/affine-block-paragraph'; -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; export const defaultBlockPlainTextAdapterMatchers: ExtensionType[] = [ ParagraphBlockPlainTextAdapterExtension, diff --git a/blocksuite/blocks/src/_common/adapters/plain-text/delta-converter/inline-delta.ts b/blocksuite/blocks/src/_common/adapters/plain-text/delta-converter/inline-delta.ts index 9f162fb4a7..86931c1a8e 100644 --- a/blocksuite/blocks/src/_common/adapters/plain-text/delta-converter/inline-delta.ts +++ b/blocksuite/blocks/src/_common/adapters/plain-text/delta-converter/inline-delta.ts @@ -3,7 +3,7 @@ import { InlineDeltaToPlainTextAdapterExtension, type TextBuffer, } from '@blocksuite/affine-shared/adapters'; -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; export const referenceDeltaMarkdownAdapterMatch = InlineDeltaToPlainTextAdapterExtension({ diff --git a/blocksuite/blocks/src/_common/export-manager/export-manager.ts b/blocksuite/blocks/src/_common/export-manager/export-manager.ts index 3e300838ad..e5c60d1b34 100644 --- a/blocksuite/blocks/src/_common/export-manager/export-manager.ts +++ b/blocksuite/blocks/src/_common/export-manager/export-manager.ts @@ -18,14 +18,13 @@ import { import { type BlockStdScope, type EditorHost, - type ExtensionType, StdIdentifier, } from '@blocksuite/block-std'; import type { GfxBlockElementModel } from '@blocksuite/block-std/gfx'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import type { IBound } from '@blocksuite/global/utils'; import { Bound } from '@blocksuite/global/utils'; -import type { Blocks } from '@blocksuite/store'; +import type { Blocks, ExtensionType } from '@blocksuite/store'; import { getBlockComponentByModel, diff --git a/blocksuite/blocks/src/_specs/common.ts b/blocksuite/blocks/src/_specs/common.ts index 13b630836e..bf196ceb06 100644 --- a/blocksuite/blocks/src/_specs/common.ts +++ b/blocksuite/blocks/src/_specs/common.ts @@ -32,7 +32,7 @@ import { EditPropsStore, FontLoaderService, } from '@blocksuite/affine-shared/services'; -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { AdapterFactoryExtensions } from '../_common/adapters/extension.js'; diff --git a/blocksuite/blocks/src/_specs/preset/edgeless-specs.ts b/blocksuite/blocks/src/_specs/preset/edgeless-specs.ts index 3225f68ed8..f041654f9a 100644 --- a/blocksuite/blocks/src/_specs/preset/edgeless-specs.ts +++ b/blocksuite/blocks/src/_specs/preset/edgeless-specs.ts @@ -1,5 +1,5 @@ import { ConnectionOverlay } from '@blocksuite/affine-block-surface'; -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { EdgelessRootBlockSpec } from '../../root-block/edgeless/edgeless-root-spec.js'; import { diff --git a/blocksuite/blocks/src/_specs/preset/page-specs.ts b/blocksuite/blocks/src/_specs/preset/page-specs.ts index da54eca3a8..4642c3aaf5 100644 --- a/blocksuite/blocks/src/_specs/preset/page-specs.ts +++ b/blocksuite/blocks/src/_specs/preset/page-specs.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { PageRootBlockSpec } from '../../root-block/page/page-root-spec.js'; import { PageFirstPartyBlockSpecs } from '../common.js'; diff --git a/blocksuite/blocks/src/_specs/preset/preview-specs.ts b/blocksuite/blocks/src/_specs/preset/preview-specs.ts index 8f22f8f502..e484da4200 100644 --- a/blocksuite/blocks/src/_specs/preset/preview-specs.ts +++ b/blocksuite/blocks/src/_specs/preset/preview-specs.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { PreviewEdgelessRootBlockSpec } from '../../root-block/edgeless/edgeless-root-spec.js'; import { PreviewPageRootBlockSpec } from '../../root-block/page/page-root-spec.js'; diff --git a/blocksuite/blocks/src/root-block/adapters/extension.ts b/blocksuite/blocks/src/root-block/adapters/extension.ts index 20e46a2615..eaab417361 100644 --- a/blocksuite/blocks/src/root-block/adapters/extension.ts +++ b/blocksuite/blocks/src/root-block/adapters/extension.ts @@ -1,4 +1,4 @@ -import type { ExtensionType } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { RootBlockHtmlAdapterExtension } from './html.js'; import { RootBlockMarkdownAdapterExtension } from './markdown.js'; diff --git a/blocksuite/blocks/src/root-block/edgeless/edgeless-root-spec.ts b/blocksuite/blocks/src/root-block/edgeless/edgeless-root-spec.ts index bb947e26d0..5d6ebf9d03 100644 --- a/blocksuite/blocks/src/root-block/edgeless/edgeless-root-spec.ts +++ b/blocksuite/blocks/src/root-block/edgeless/edgeless-root-spec.ts @@ -17,11 +17,11 @@ import { BlockServiceWatcher, BlockViewExtension, CommandExtension, - type ExtensionType, FlavourExtension, WidgetViewMapExtension, } from '@blocksuite/block-std'; import { ToolController } from '@blocksuite/block-std/gfx'; +import type { ExtensionType } from '@blocksuite/store'; import { literal, unsafeStatic } from 'lit/static-html.js'; import { ExportManagerExtension } from '../../_common/export-manager/export-manager.js'; diff --git a/blocksuite/blocks/src/root-block/page/page-root-spec.ts b/blocksuite/blocks/src/root-block/page/page-root-spec.ts index fb8fdd7b91..96e772383c 100644 --- a/blocksuite/blocks/src/root-block/page/page-root-spec.ts +++ b/blocksuite/blocks/src/root-block/page/page-root-spec.ts @@ -12,10 +12,10 @@ import { AFFINE_SCROLL_ANCHORING_WIDGET } from '@blocksuite/affine-widget-scroll import { BlockViewExtension, CommandExtension, - type ExtensionType, FlavourExtension, WidgetViewMapExtension, } from '@blocksuite/block-std'; +import type { ExtensionType } from '@blocksuite/store'; import { literal, unsafeStatic } from 'lit/static-html.js'; import { ExportManagerExtension } from '../../_common/export-manager/export-manager.js'; diff --git a/blocksuite/blocks/src/root-block/preview/preview-root-spec.ts b/blocksuite/blocks/src/root-block/preview/preview-root-spec.ts index aef6221a41..5c45a0ff47 100644 --- a/blocksuite/blocks/src/root-block/preview/preview-root-spec.ts +++ b/blocksuite/blocks/src/root-block/preview/preview-root-spec.ts @@ -1,8 +1,5 @@ -import { - BlockViewExtension, - type ExtensionType, - 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'; import { PageRootService } from '../page/page-root-service.js'; diff --git a/blocksuite/framework/block-std/src/__tests__/test-editor.ts b/blocksuite/framework/block-std/src/__tests__/test-editor.ts index 757a17f283..b5b03c8818 100644 --- a/blocksuite/framework/block-std/src/__tests__/test-editor.ts +++ b/blocksuite/framework/block-std/src/__tests__/test-editor.ts @@ -1,9 +1,8 @@ import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils'; -import type { Blocks } from '@blocksuite/store'; +import type { Blocks, ExtensionType } from '@blocksuite/store'; import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import type { ExtensionType } from '../extension/index.js'; import { BlockStdScope } from '../scope/index.js'; import { ShadowlessElement } from '../view/index.js'; diff --git a/blocksuite/framework/block-std/src/__tests__/test-spec.ts b/blocksuite/framework/block-std/src/__tests__/test-spec.ts index 22ac3953bd..9cecf4e59c 100644 --- a/blocksuite/framework/block-std/src/__tests__/test-spec.ts +++ b/blocksuite/framework/block-std/src/__tests__/test-spec.ts @@ -1,8 +1,9 @@ import './test-block.js'; +import type { ExtensionType } from '@blocksuite/store'; import { literal } from 'lit/static-html.js'; -import { BlockViewExtension, type ExtensionType } from '../extension/index.js'; +import { BlockViewExtension } from '../extension/index.js'; import type { HeadingBlockModel } from './test-schema.js'; export const testSpecs: ExtensionType[] = [ diff --git a/blocksuite/framework/block-std/src/extension/block-view.ts b/blocksuite/framework/block-std/src/extension/block-view.ts index b2808150b2..4397ea9aea 100644 --- a/blocksuite/framework/block-std/src/extension/block-view.ts +++ b/blocksuite/framework/block-std/src/extension/block-view.ts @@ -1,6 +1,7 @@ +import type { ExtensionType } from '@blocksuite/store'; + import { BlockViewIdentifier } from '../identifier.js'; import type { BlockViewType } from '../spec/type.js'; -import type { ExtensionType } from './extension.js'; /** * Create a block view extension. diff --git a/blocksuite/framework/block-std/src/extension/command.ts b/blocksuite/framework/block-std/src/extension/command.ts index 1c122be8e1..d92d57227f 100644 --- a/blocksuite/framework/block-std/src/extension/command.ts +++ b/blocksuite/framework/block-std/src/extension/command.ts @@ -1,6 +1,7 @@ +import type { ExtensionType } from '@blocksuite/store'; + import { CommandIdentifier } from '../identifier.js'; import type { BlockCommands } from '../spec/index.js'; -import type { ExtensionType } from './extension.js'; /** * Create a command extension. diff --git a/blocksuite/framework/block-std/src/extension/config.ts b/blocksuite/framework/block-std/src/extension/config.ts index fbb7527207..b74f9498e9 100644 --- a/blocksuite/framework/block-std/src/extension/config.ts +++ b/blocksuite/framework/block-std/src/extension/config.ts @@ -1,5 +1,6 @@ +import type { ExtensionType } from '@blocksuite/store'; + import { ConfigIdentifier } from '../identifier.js'; -import type { ExtensionType } from './extension.js'; /** * Create a config extension. diff --git a/blocksuite/framework/block-std/src/extension/flavour.ts b/blocksuite/framework/block-std/src/extension/flavour.ts index 53c6855207..6fd4a1d506 100644 --- a/blocksuite/framework/block-std/src/extension/flavour.ts +++ b/blocksuite/framework/block-std/src/extension/flavour.ts @@ -1,5 +1,6 @@ +import type { ExtensionType } from '@blocksuite/store'; + import { BlockFlavourIdentifier } from '../identifier.js'; -import type { ExtensionType } from './extension.js'; /** * Create a flavour extension. diff --git a/blocksuite/framework/block-std/src/extension/index.ts b/blocksuite/framework/block-std/src/extension/index.ts index 6365406bce..8171ad221c 100644 --- a/blocksuite/framework/block-std/src/extension/index.ts +++ b/blocksuite/framework/block-std/src/extension/index.ts @@ -1,7 +1,6 @@ export * from './block-view.js'; export * from './command.js'; export * from './config.js'; -export * from './extension.js'; export * from './flavour.js'; export * from './keymap.js'; export * from './lifecycle-watcher.js'; diff --git a/blocksuite/framework/block-std/src/extension/keymap.ts b/blocksuite/framework/block-std/src/extension/keymap.ts index 5b75ffee92..801b8a1698 100644 --- a/blocksuite/framework/block-std/src/extension/keymap.ts +++ b/blocksuite/framework/block-std/src/extension/keymap.ts @@ -1,7 +1,8 @@ +import type { ExtensionType } from '@blocksuite/store'; + import type { EventOptions, UIEventHandler } from '../event/index.js'; import { KeymapIdentifier } from '../identifier.js'; import type { BlockStdScope } from '../scope/index.js'; -import type { ExtensionType } from './extension.js'; let id = 1; diff --git a/blocksuite/framework/block-std/src/extension/lifecycle-watcher.ts b/blocksuite/framework/block-std/src/extension/lifecycle-watcher.ts index e9c822aa27..5c62881d21 100644 --- a/blocksuite/framework/block-std/src/extension/lifecycle-watcher.ts +++ b/blocksuite/framework/block-std/src/extension/lifecycle-watcher.ts @@ -1,9 +1,9 @@ import type { Container } from '@blocksuite/global/di'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import { Extension } from '@blocksuite/store'; import { LifeCycleWatcherIdentifier, StdIdentifier } from '../identifier.js'; import type { BlockStdScope } from '../scope/index.js'; -import { Extension } from './extension.js'; /** * A life cycle watcher is an extension that watches the life cycle of the editor. diff --git a/blocksuite/framework/block-std/src/extension/selection.ts b/blocksuite/framework/block-std/src/extension/selection.ts index 98b1fcde83..33162c92b6 100644 --- a/blocksuite/framework/block-std/src/extension/selection.ts +++ b/blocksuite/framework/block-std/src/extension/selection.ts @@ -1,6 +1,7 @@ +import type { ExtensionType } from '@blocksuite/store'; + import { SelectionIdentifier } from '../identifier.js'; import type { SelectionConstructor } from '../selection/index.js'; -import type { ExtensionType } from './extension.js'; export function SelectionExtension( selectionCtor: SelectionConstructor diff --git a/blocksuite/framework/block-std/src/extension/service.ts b/blocksuite/framework/block-std/src/extension/service.ts index 2bf6aea26c..47cf062871 100644 --- a/blocksuite/framework/block-std/src/extension/service.ts +++ b/blocksuite/framework/block-std/src/extension/service.ts @@ -1,6 +1,7 @@ import type { Container } from '@blocksuite/global/di'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import { DisposableGroup } from '@blocksuite/global/utils'; +import { Extension } from '@blocksuite/store'; import type { EventName, UIEventHandler } from '../event/index.js'; import { @@ -10,7 +11,6 @@ import { } from '../identifier.js'; import type { BlockStdScope } from '../scope/index.js'; import { getSlots } from '../spec/index.js'; -import { Extension } from './extension.js'; /** * @deprecated diff --git a/blocksuite/framework/block-std/src/extension/widget-view-map.ts b/blocksuite/framework/block-std/src/extension/widget-view-map.ts index 47d75efa05..1559e18aed 100644 --- a/blocksuite/framework/block-std/src/extension/widget-view-map.ts +++ b/blocksuite/framework/block-std/src/extension/widget-view-map.ts @@ -1,6 +1,7 @@ +import type { ExtensionType } from '@blocksuite/store'; + import { WidgetViewMapIdentifier } from '../identifier.js'; import type { WidgetViewMapType } from '../spec/type.js'; -import type { ExtensionType } from './extension.js'; /** * Create a widget view map extension. diff --git a/blocksuite/framework/block-std/src/gfx/extension.ts b/blocksuite/framework/block-std/src/gfx/extension.ts index ee99878497..c0796808f5 100644 --- a/blocksuite/framework/block-std/src/gfx/extension.ts +++ b/blocksuite/framework/block-std/src/gfx/extension.ts @@ -1,7 +1,7 @@ import { type Container, createIdentifier } from '@blocksuite/global/di'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import { Extension } from '@blocksuite/store'; -import { Extension } from '../extension/extension.js'; import type { GfxController } from './controller.js'; import { GfxControllerIdentifier } from './identifiers.js'; diff --git a/blocksuite/framework/block-std/src/gfx/surface-middleware.ts b/blocksuite/framework/block-std/src/gfx/surface-middleware.ts index c0be95e49d..7876626d96 100644 --- a/blocksuite/framework/block-std/src/gfx/surface-middleware.ts +++ b/blocksuite/framework/block-std/src/gfx/surface-middleware.ts @@ -1,7 +1,7 @@ import { type Container, createIdentifier } from '@blocksuite/global/di'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; +import { Extension } from '@blocksuite/store'; -import { Extension } from '../extension/extension.js'; import { LifeCycleWatcher } from '../extension/lifecycle-watcher.js'; import { StdIdentifier } from '../identifier.js'; import type { BlockStdScope } from '../scope/block-std-scope.js'; diff --git a/blocksuite/framework/block-std/src/gfx/tool/tool.ts b/blocksuite/framework/block-std/src/gfx/tool/tool.ts index 31af3c083a..aa9e06e4f6 100644 --- a/blocksuite/framework/block-std/src/gfx/tool/tool.ts +++ b/blocksuite/framework/block-std/src/gfx/tool/tool.ts @@ -1,9 +1,9 @@ import { type Container, createIdentifier } from '@blocksuite/global/di'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; import { DisposableGroup } from '@blocksuite/global/utils'; +import { Extension } from '@blocksuite/store'; import type { PointerEventState } from '../../event/index.js'; -import { Extension } from '../../extension/extension.js'; import type { GfxController } from '../controller.js'; import { GfxControllerIdentifier } from '../identifiers.js'; import type { ToolEventTarget } from './tool-controller.js'; diff --git a/blocksuite/framework/block-std/src/gfx/view/view.ts b/blocksuite/framework/block-std/src/gfx/view/view.ts index 63e89bc1e3..832bc11c47 100644 --- a/blocksuite/framework/block-std/src/gfx/view/view.ts +++ b/blocksuite/framework/block-std/src/gfx/view/view.ts @@ -5,9 +5,9 @@ import { DisposableGroup, type IVec, } from '@blocksuite/global/utils'; +import type { Extension } from '@blocksuite/store'; import type { PointerEventState } from '../../event/index.js'; -import type { Extension } from '../../extension/extension.js'; import type { EditorHost } from '../../view/index.js'; import type { GfxController } from '../index.js'; import type { GfxElementGeometry, PointTestOptions } from '../model/base.js'; diff --git a/blocksuite/framework/block-std/src/scope/block-std-scope.ts b/blocksuite/framework/block-std/src/scope/block-std-scope.ts index 6a2bcae6f5..eaf623c506 100644 --- a/blocksuite/framework/block-std/src/scope/block-std-scope.ts +++ b/blocksuite/framework/block-std/src/scope/block-std-scope.ts @@ -1,12 +1,17 @@ import type { ServiceProvider } from '@blocksuite/global/di'; import { Container } from '@blocksuite/global/di'; import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions'; -import { type Blocks, Job, type JobMiddleware } from '@blocksuite/store'; +import { + type Blocks, + type ExtensionType, + Job, + type JobMiddleware, +} from '@blocksuite/store'; import { Clipboard } from '../clipboard/index.js'; import { CommandManager } from '../command/index.js'; import { UIEventDispatcher } from '../event/index.js'; -import type { BlockService, ExtensionType } from '../extension/index.js'; +import type { BlockService } from '../extension/index.js'; import { GfxController } from '../gfx/controller.js'; import { GfxSelectionManager } from '../gfx/selection.js'; import { SurfaceMiddlewareExtension } from '../gfx/surface-middleware.js'; diff --git a/blocksuite/framework/block-std/src/extension/extension.ts b/blocksuite/framework/store/src/extension/index.ts similarity index 100% rename from blocksuite/framework/block-std/src/extension/extension.ts rename to blocksuite/framework/store/src/extension/index.ts diff --git a/blocksuite/framework/store/src/index.ts b/blocksuite/framework/store/src/index.ts index 84b5e248cc..095de799bd 100644 --- a/blocksuite/framework/store/src/index.ts +++ b/blocksuite/framework/store/src/index.ts @@ -2,6 +2,7 @@ /// export * from './adapter/index.js'; +export * from './extension/index.js'; export * from './model/index.js'; export * from './reactive/index.js'; export * from './schema/index.js'; diff --git a/blocksuite/presets/src/editors/editor-container.ts b/blocksuite/presets/src/editors/editor-container.ts index 3d5b49da80..75891680d1 100644 --- a/blocksuite/presets/src/editors/editor-container.ts +++ b/blocksuite/presets/src/editors/editor-container.ts @@ -1,8 +1,4 @@ -import { - BlockStdScope, - type ExtensionType, - ShadowlessElement, -} from '@blocksuite/block-std'; +import { BlockStdScope, ShadowlessElement } from '@blocksuite/block-std'; import { type AbstractEditor, type DocMode, @@ -11,7 +7,7 @@ import { ThemeProvider, } from '@blocksuite/blocks'; import { SignalWatcher, Slot, WithDisposable } from '@blocksuite/global/utils'; -import type { BlockModel, Blocks } from '@blocksuite/store'; +import type { BlockModel, Blocks, ExtensionType } from '@blocksuite/store'; import { computed, signal } from '@preact/signals-core'; import { css, html } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/presets/_common/components/text-renderer.ts b/packages/frontend/core/src/blocksuite/presets/_common/components/text-renderer.ts index f68b5f1122..f75ac32dba 100644 --- a/packages/frontend/core/src/blocksuite/presets/_common/components/text-renderer.ts +++ b/packages/frontend/core/src/blocksuite/presets/_common/components/text-renderer.ts @@ -1,7 +1,6 @@ import { BlockStdScope, type EditorHost, - type ExtensionType, ShadowlessElement, } from '@blocksuite/affine/block-std'; import type { @@ -21,6 +20,7 @@ import { Container, type ServiceProvider } from '@blocksuite/affine/global/di'; import { WithDisposable } from '@blocksuite/affine/global/utils'; import { type Blocks, + type ExtensionType, type JobMiddleware, type Query, type Schema, diff --git a/packages/frontend/core/src/blocksuite/presets/_common/utils/custom-specs.ts b/packages/frontend/core/src/blocksuite/presets/_common/utils/custom-specs.ts index 537041feea..62df9beaa4 100644 --- a/packages/frontend/core/src/blocksuite/presets/_common/utils/custom-specs.ts +++ b/packages/frontend/core/src/blocksuite/presets/_common/utils/custom-specs.ts @@ -1,8 +1,6 @@ -import { - BlockViewIdentifier, - type ExtensionType, -} from '@blocksuite/affine/block-std'; +import { BlockViewIdentifier } from '@blocksuite/affine/block-std'; import { PageEditorBlockSpecs } from '@blocksuite/affine/blocks'; +import type { ExtensionType } from '@blocksuite/affine/store'; import { literal } from 'lit/static-html.js'; export const CustomPageEditorBlockSpecs: ExtensionType[] = [ diff --git a/packages/frontend/core/src/blocksuite/presets/ai/ai-spec.ts b/packages/frontend/core/src/blocksuite/presets/ai/ai-spec.ts index d7e2334318..b672cf1e3a 100644 --- a/packages/frontend/core/src/blocksuite/presets/ai/ai-spec.ts +++ b/packages/frontend/core/src/blocksuite/presets/ai/ai-spec.ts @@ -1,6 +1,5 @@ import { BlockServiceWatcher, - type ExtensionType, WidgetViewMapIdentifier, } from '@blocksuite/affine/block-std'; import { @@ -23,6 +22,7 @@ import { ParagraphBlockSpec, } from '@blocksuite/affine/blocks'; import { assertInstanceOf } from '@blocksuite/affine/global/utils'; +import type { ExtensionType } from '@blocksuite/affine/store'; import { literal, unsafeStatic } from 'lit/static-html.js'; import { buildAIPanelConfig } from './ai-panel'; diff --git a/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/spec.ts b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/spec.ts index 2e16c1f78c..ded05d1bca 100644 --- a/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/spec.ts +++ b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/spec.ts @@ -1,6 +1,5 @@ import { BlockViewExtension, - type ExtensionType, FlavourExtension, } from '@blocksuite/affine/block-std'; import { @@ -10,7 +9,7 @@ import { SurfaceBlockSchema, ThemeService, } from '@blocksuite/affine/blocks'; -import type { BlockSchema } from '@blocksuite/affine/store'; +import type { BlockSchema, ExtensionType } from '@blocksuite/affine/store'; import { literal } from 'lit/static-html.js'; import type { z } from 'zod'; diff --git a/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/ai-chat-spec.ts b/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/ai-chat-spec.ts index 76fec58242..88bf0275b2 100644 --- a/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/ai-chat-spec.ts +++ b/packages/frontend/core/src/blocksuite/presets/blocks/ai-chat-block/ai-chat-spec.ts @@ -1,7 +1,5 @@ -import { - BlockViewExtension, - type ExtensionType, -} from '@blocksuite/affine/block-std'; +import { BlockViewExtension } from '@blocksuite/affine/block-std'; +import type { ExtensionType } from '@blocksuite/affine/store'; import { literal } from 'lit/static-html.js'; export const AIChatBlockSpec: ExtensionType[] = [ diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/common.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/common.ts index fe9721eb8e..75bce26ab9 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/common.ts +++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/common.ts @@ -4,7 +4,6 @@ import { AIParagraphBlockSpec, } from '@affine/core/blocksuite/presets/ai'; import { AIChatBlockSpec } from '@affine/core/blocksuite/presets/blocks/ai-chat-block'; -import type { ExtensionType } from '@blocksuite/affine/block-std'; import { AdapterFactoryExtensions, AttachmentBlockSpec, @@ -23,6 +22,7 @@ import { RefNodeSlotsExtension, RichTextExtensions, } from '@blocksuite/affine/blocks'; +import type { ExtensionType } from '@blocksuite/affine/store'; const CommonBlockSpecs: ExtensionType[] = [ RefNodeSlotsExtension, diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/root-block.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/root-block.ts index 62e6e48887..d7edc88cb8 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/root-block.ts +++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/root-block.ts @@ -11,7 +11,6 @@ import { AppThemeService } from '@affine/core/modules/theme'; import { mixpanel } from '@affine/track'; import { ConfigExtension, - type ExtensionType, LifeCycleWatcher, StdIdentifier, } from '@blocksuite/affine/block-std'; @@ -33,6 +32,7 @@ import { TelemetryProvider, ThemeExtensionIdentifier, } from '@blocksuite/affine/blocks'; +import type { ExtensionType } from '@blocksuite/affine/store'; import { createSignalFromObservable, referenceToNode, diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx index 7e8992bebf..34f248a54b 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx +++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx @@ -32,7 +32,6 @@ import { BlockServiceWatcher, BlockViewIdentifier, ConfigIdentifier, - type ExtensionType, type WidgetComponent, } from '@blocksuite/affine/block-std'; import type { @@ -60,7 +59,11 @@ import { ReferenceNodeConfigExtension, } from '@blocksuite/affine/blocks'; import { Bound } from '@blocksuite/affine/global/utils'; -import { type BlockSnapshot, Text } from '@blocksuite/affine/store'; +import { + type BlockSnapshot, + type ExtensionType, + Text, +} from '@blocksuite/affine/store'; import type { ReferenceParams } from '@blocksuite/affine-model'; import { type FrameworkProvider } from '@toeverything/infra'; import { type TemplateResult } from 'lit'; diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/edgeless.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/edgeless.ts index ab30c6b41b..44e8cd080a 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/edgeless.ts +++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/edgeless.ts @@ -2,13 +2,13 @@ import { AIEdgelessRootBlockSpec } from '@affine/core/blocksuite/presets/ai'; import { FeatureFlagService } from '@affine/core/modules/feature-flag'; import { builtInTemplates as builtInEdgelessTemplates } from '@affine/templates/edgeless'; import { builtInTemplates as builtInStickersTemplates } from '@affine/templates/stickers'; -import type { ExtensionType } from '@blocksuite/affine/block-std'; import type { TemplateManager } from '@blocksuite/affine/blocks'; import { EdgelessRootBlockSpec, EdgelessTemplatePanel, SpecProvider, } from '@blocksuite/affine/blocks'; +import type { ExtensionType } from '@blocksuite/affine/store'; import { type FrameworkProvider } from '@toeverything/infra'; import { enableAffineExtension, enableAIExtension } from './custom/root-block'; diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/page.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/page.ts index 3a50712468..62165bc218 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/page.ts +++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/page.ts @@ -1,7 +1,7 @@ import { AIPageRootBlockSpec } from '@affine/core/blocksuite/presets/ai'; import { FeatureFlagService } from '@affine/core/modules/feature-flag'; -import type { ExtensionType } from '@blocksuite/affine/block-std'; import { PageRootBlockSpec, SpecProvider } from '@blocksuite/affine/blocks'; +import type { ExtensionType } from '@blocksuite/affine/store'; import { type FrameworkProvider } from '@toeverything/infra'; import { enableAffineExtension, enableAIExtension } from './custom/root-block'; diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/preview.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/preview.ts index bd78ac0584..90e08b1449 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/preview.ts +++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/preview.ts @@ -1,6 +1,6 @@ import { AIChatBlockSpec } from '@affine/core/blocksuite/presets/blocks/ai-chat-block'; -import type { ExtensionType } from '@blocksuite/affine/block-std'; import { SpecProvider } from '@blocksuite/affine/blocks'; +import type { ExtensionType } from '@blocksuite/affine/store'; import { getFontConfigExtension } from './font-extension';