chore: each block maintain its own adapter extension (#9224)

blocksuite/affine/block-embed/src/embed-figma-block/adapters/extension.ts

@@ -0,0 +1,11 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { EmbedFigmaBlockHtmlAdapterExtension } from './html.js';
+import { EmbedFigmaMarkdownAdapterExtension } from './markdown.js';
+import { EmbedFigmaBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const EmbedFigmaBlockAdapterExtensions: ExtensionType[] = [
+  EmbedFigmaBlockHtmlAdapterExtension,
+  EmbedFigmaMarkdownAdapterExtension,
+  EmbedFigmaBlockPlainTextAdapterExtension,
+];

blocksuite/affine/block-embed/src/embed-figma-block/embed-figma-spec.ts

@@ -5,6 +5,7 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { EmbedFigmaBlockAdapterExtensions } from './adapters/extension.js';
 import { EmbedFigmaBlockService } from './embed-figma-service.js';
 
 export const EmbedFigmaBlockSpec: ExtensionType[] = [
@@ -15,4 +16,5 @@ export const EmbedFigmaBlockSpec: ExtensionType[] = [
       ? literal`affine-embed-edgeless-figma-block`
       : literal`affine-embed-figma-block`;
   }),
-];
+  EmbedFigmaBlockAdapterExtensions,
+].flat();

blocksuite/affine/block-embed/src/embed-github-block/adapters/extension.ts

@@ -0,0 +1,11 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { EmbedGithubBlockHtmlAdapterExtension } from './html.js';
+import { EmbedGithubMarkdownAdapterExtension } from './markdown.js';
+import { EmbedGithubBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const EmbedGithubBlockAdapterExtensions: ExtensionType[] = [
+  EmbedGithubBlockHtmlAdapterExtension,
+  EmbedGithubMarkdownAdapterExtension,
+  EmbedGithubBlockPlainTextAdapterExtension,
+];

blocksuite/affine/block-embed/src/embed-github-block/embed-github-spec.ts

@@ -5,6 +5,7 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { EmbedGithubBlockAdapterExtensions } from './adapters/extension.js';
 import { EmbedGithubBlockService } from './embed-github-service.js';
 
 export const EmbedGithubBlockSpec: ExtensionType[] = [
@@ -15,4 +16,5 @@ export const EmbedGithubBlockSpec: ExtensionType[] = [
       ? literal`affine-embed-edgeless-github-block`
       : literal`affine-embed-github-block`;
   }),
-];
+  EmbedGithubBlockAdapterExtensions,
+].flat();

blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/extension.ts

@@ -0,0 +1,11 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { EmbedLinkedDocHtmlAdapterExtension } from './html.js';
+import { EmbedLinkedDocMarkdownAdapterExtension } from './markdown.js';
+import { EmbedLinkedDocBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const EmbedLinkedDocBlockAdapterExtensions: ExtensionType[] = [
+  EmbedLinkedDocHtmlAdapterExtension,
+  EmbedLinkedDocMarkdownAdapterExtension,
+  EmbedLinkedDocBlockPlainTextAdapterExtension,
+];

blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-spec.ts

@@ -5,6 +5,7 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { EmbedLinkedDocBlockAdapterExtensions } from './adapters/extension.js';
 import { commands } from './commands/index.js';
 
 export const EmbedLinkedDocBlockSpec: ExtensionType[] = [
@@ -14,4 +15,5 @@ export const EmbedLinkedDocBlockSpec: ExtensionType[] = [
       ? literal`affine-embed-edgeless-linked-doc-block`
       : literal`affine-embed-linked-doc-block`;
   }),
-];
+  EmbedLinkedDocBlockAdapterExtensions,
+].flat();

blocksuite/affine/block-embed/src/embed-loom-block/adapters/extension.ts

@@ -0,0 +1,11 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { EmbedLoomBlockHtmlAdapterExtension } from './html.js';
+import { EmbedLoomMarkdownAdapterExtension } from './markdown.js';
+import { EmbedLoomBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const EmbedLoomBlockAdapterExtensions: ExtensionType[] = [
+  EmbedLoomBlockHtmlAdapterExtension,
+  EmbedLoomMarkdownAdapterExtension,
+  EmbedLoomBlockPlainTextAdapterExtension,
+];

blocksuite/affine/block-embed/src/embed-loom-block/embed-loom-spec.ts

@@ -5,6 +5,7 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { EmbedLoomBlockAdapterExtensions } from './adapters/extension.js';
 import { EmbedLoomBlockService } from './embed-loom-service.js';
 
 export const EmbedLoomBlockSpec: ExtensionType[] = [
@@ -15,4 +16,5 @@ export const EmbedLoomBlockSpec: ExtensionType[] = [
       ? literal`affine-embed-edgeless-loom-block`
       : literal`affine-embed-loom-block`;
   }),
-];
+  EmbedLoomBlockAdapterExtensions,
+].flat();

blocksuite/affine/block-embed/src/embed-synced-doc-block/adapters/extension.ts

@@ -0,0 +1,11 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { EmbedSyncedDocBlockHtmlAdapterExtension } from './html.js';
+import { EmbedSyncedDocBlockMarkdownAdapterExtension } from './markdown.js';
+import { EmbedSyncedDocBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const EmbedSyncedDocBlockAdapterExtensions: ExtensionType[] = [
+  EmbedSyncedDocBlockHtmlAdapterExtension,
+  EmbedSyncedDocBlockMarkdownAdapterExtension,
+  EmbedSyncedDocBlockPlainTextAdapterExtension,
+];

blocksuite/affine/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts

@@ -5,6 +5,7 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { EmbedSyncedDocBlockAdapterExtensions } from './adapters/extension.js';
 import { EmbedSyncedDocBlockService } from './embed-synced-doc-service.js';
 
 export const EmbedSyncedDocBlockSpec: ExtensionType[] = [
@@ -15,4 +16,5 @@ export const EmbedSyncedDocBlockSpec: ExtensionType[] = [
       ? literal`affine-embed-edgeless-synced-doc-block`
       : literal`affine-embed-synced-doc-block`;
   }),
-];
+  EmbedSyncedDocBlockAdapterExtensions,
+].flat();

blocksuite/affine/block-embed/src/embed-youtube-block/adapters/extension.ts

@@ -0,0 +1,11 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { EmbedYoutubeBlockHtmlAdapterExtension } from './html.js';
+import { EmbedYoutubeMarkdownAdapterExtension } from './markdown.js';
+import { EmbedYoutubeBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const EmbedYoutubeBlockAdapterExtensions: ExtensionType[] = [
+  EmbedYoutubeBlockHtmlAdapterExtension,
+  EmbedYoutubeMarkdownAdapterExtension,
+  EmbedYoutubeBlockPlainTextAdapterExtension,
+];

blocksuite/affine/block-embed/src/embed-youtube-block/embed-youtube-spec.ts

@@ -5,6 +5,7 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { EmbedYoutubeBlockAdapterExtensions } from './adapters/extension.js';
 import { EmbedYoutubeBlockService } from './embed-youtube-service.js';
 
 export const EmbedYoutubeBlockSpec: ExtensionType[] = [
@@ -15,4 +16,5 @@ export const EmbedYoutubeBlockSpec: ExtensionType[] = [
       ? literal`affine-embed-edgeless-youtube-block`
       : literal`affine-embed-youtube-block`;
   }),
-];
+  EmbedYoutubeBlockAdapterExtensions,
+].flat();

blocksuite/affine/block-list/src/adapters/extension.ts

@@ -0,0 +1,13 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { ListBlockHtmlAdapterExtension } from './html.js';
+import { ListBlockMarkdownAdapterExtension } from './markdown.js';
+import { ListBlockNotionHtmlAdapterExtension } from './notion-html.js';
+import { ListBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const ListBlockAdapterExtensions: ExtensionType[] = [
+  ListBlockHtmlAdapterExtension,
+  ListBlockMarkdownAdapterExtension,
+  ListBlockPlainTextAdapterExtension,
+  ListBlockNotionHtmlAdapterExtension,
+];

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

@@ -6,6 +6,7 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { ListBlockAdapterExtensions } from './adapters/extension.js';
 import { commands } from './commands/index.js';
 import { ListKeymapExtension, ListTextKeymapExtension } from './list-keymap.js';
 import { ListBlockService, ListDragHandleOption } from './list-service.js';
@@ -18,4 +19,5 @@ export const ListBlockSpec: ExtensionType[] = [
   ListKeymapExtension,
   ListTextKeymapExtension,
   ListDragHandleOption,
-];
+  ListBlockAdapterExtensions,
+].flat();

blocksuite/affine/block-paragraph/src/adapters/extension.ts

@@ -0,0 +1,13 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { ParagraphBlockHtmlAdapterExtension } from './html.js';
+import { ParagraphBlockMarkdownAdapterExtension } from './markdown.js';
+import { ParagraphBlockNotionHtmlAdapterExtension } from './notion-html.js';
+import { ParagraphBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const ParagraphBlockAdapterExtensions: ExtensionType[] = [
+  ParagraphBlockHtmlAdapterExtension,
+  ParagraphBlockMarkdownAdapterExtension,
+  ParagraphBlockPlainTextAdapterExtension,
+  ParagraphBlockNotionHtmlAdapterExtension,
+];

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

@@ -6,6 +6,7 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { ParagraphBlockAdapterExtensions } from './adapters/extension.js';
 import { commands } from './commands/index.js';
 import { ParagraphDragHandleOption } from './paragraph-drag-extension.js';
 import {
@@ -22,4 +23,5 @@ export const ParagraphBlockSpec: ExtensionType[] = [
   ParagraphTextKeymapExtension,
   ParagraphKeymapExtension,
   ParagraphDragHandleOption,
-];
+  ParagraphBlockAdapterExtensions,
+].flat();

blocksuite/affine/block-surface/src/adapters/extension.ts

@@ -1,4 +1,3 @@
-import { SurfaceBlockHtmlAdapterExtension } from './html-adapter/html.js';
 import {
   EdgelessSurfaceBlockMarkdownAdapterExtension,
   SurfaceBlockMarkdownAdapterExtension,
@@ -11,7 +10,6 @@ import {
 export const SurfaceBlockAdapterExtensions = [
   SurfaceBlockPlainTextAdapterExtension,
   SurfaceBlockMarkdownAdapterExtension,
-  SurfaceBlockHtmlAdapterExtension,
 ];
 
 export const EdgelessSurfaceBlockAdapterExtensions = [

blocksuite/blocks/src/_common/adapters/extension.ts

@@ -1,16 +1,12 @@
 import type { ExtensionType } from '@blocksuite/block-std';
 
 import { AttachmentAdapterFactoryExtension } from './attachment.js';
-import { BlockHtmlAdapterExtensions } from './html-adapter/block-matcher.js';
 import { HtmlAdapterFactoryExtension } from './html-adapter/html.js';
 import { ImageAdapterFactoryExtension } from './image.js';
-import { BlockMarkdownAdapterExtensions } from './markdown/block-matcher.js';
 import { MarkdownAdapterFactoryExtension } from './markdown/markdown.js';
 import { MixTextAdapterFactoryExtension } from './mix-text.js';
-import { BlockNotionHtmlAdapterExtensions } from './notion-html/block-matcher.js';
 import { NotionHtmlAdapterFactoryExtension } from './notion-html/notion-html.js';
 import { NotionTextAdapterFactoryExtension } from './notion-text.js';
-import { BlockPlainTextAdapterExtensions } from './plain-text/block-matcher.js';
 import { PlainTextAdapterFactoryExtension } from './plain-text/plain-text.js';
 
 export const AdapterFactoryExtensions: ExtensionType[] = [
@@ -23,10 +19,3 @@ export const AdapterFactoryExtensions: ExtensionType[] = [
   NotionHtmlAdapterFactoryExtension,
   MixTextAdapterFactoryExtension,
 ];
-
-export const BlockAdapterMatcherExtensions: ExtensionType[] = [
-  BlockPlainTextAdapterExtensions,
-  BlockMarkdownAdapterExtensions,
-  BlockHtmlAdapterExtensions,
-  BlockNotionHtmlAdapterExtensions,
-].flat();

blocksuite/blocks/src/_common/adapters/html-adapter/block-matcher.ts

@@ -1,51 +1,20 @@
 import {
-  EmbedFigmaBlockHtmlAdapterExtension,
   embedFigmaBlockHtmlAdapterMatcher,
-  EmbedGithubBlockHtmlAdapterExtension,
   embedGithubBlockHtmlAdapterMatcher,
   embedLinkedDocBlockHtmlAdapterMatcher,
-  EmbedLinkedDocHtmlAdapterExtension,
-  EmbedLoomBlockHtmlAdapterExtension,
   embedLoomBlockHtmlAdapterMatcher,
-  EmbedSyncedDocBlockHtmlAdapterExtension,
   embedSyncedDocBlockHtmlAdapterMatcher,
-  EmbedYoutubeBlockHtmlAdapterExtension,
   embedYoutubeBlockHtmlAdapterMatcher,
 } from '@blocksuite/affine-block-embed';
-import {
-  ListBlockHtmlAdapterExtension,
-  listBlockHtmlAdapterMatcher,
-} from '@blocksuite/affine-block-list';
-import {
-  ParagraphBlockHtmlAdapterExtension,
-  paragraphBlockHtmlAdapterMatcher,
-} from '@blocksuite/affine-block-paragraph';
-import type { ExtensionType } from '@blocksuite/block-std';
+import { listBlockHtmlAdapterMatcher } from '@blocksuite/affine-block-list';
+import { paragraphBlockHtmlAdapterMatcher } from '@blocksuite/affine-block-paragraph';
 
-import {
-  BookmarkBlockHtmlAdapterExtension,
-  bookmarkBlockHtmlAdapterMatcher,
-} from '../../../bookmark-block/adapters/html.js';
-import {
-  CodeBlockHtmlAdapterExtension,
-  codeBlockHtmlAdapterMatcher,
-} from '../../../code-block/adapters/html.js';
-import {
-  DatabaseBlockHtmlAdapterExtension,
-  databaseBlockHtmlAdapterMatcher,
-} from '../../../database-block/adapters/html.js';
-import {
-  DividerBlockHtmlAdapterExtension,
-  dividerBlockHtmlAdapterMatcher,
-} from '../../../divider-block/adapters/html.js';
-import {
-  ImageBlockHtmlAdapterExtension,
-  imageBlockHtmlAdapterMatcher,
-} from '../../../image-block/adapters/html.js';
-import {
-  RootBlockHtmlAdapterExtension,
-  rootBlockHtmlAdapterMatcher,
-} from '../../../root-block/adapters/html.js';
+import { bookmarkBlockHtmlAdapterMatcher } from '../../../bookmark-block/adapters/html.js';
+import { codeBlockHtmlAdapterMatcher } from '../../../code-block/adapters/html.js';
+import { databaseBlockHtmlAdapterMatcher } from '../../../database-block/adapters/html.js';
+import { dividerBlockHtmlAdapterMatcher } from '../../../divider-block/adapters/html.js';
+import { imageBlockHtmlAdapterMatcher } from '../../../image-block/adapters/html.js';
+import { rootBlockHtmlAdapterMatcher } from '../../../root-block/adapters/html.js';
 
 export const defaultBlockHtmlAdapterMatchers = [
   listBlockHtmlAdapterMatcher,
@@ -63,20 +32,3 @@ export const defaultBlockHtmlAdapterMatchers = [
   embedLinkedDocBlockHtmlAdapterMatcher,
   embedSyncedDocBlockHtmlAdapterMatcher,
 ];
-
-export const BlockHtmlAdapterExtensions: ExtensionType[] = [
-  ListBlockHtmlAdapterExtension,
-  ParagraphBlockHtmlAdapterExtension,
-  CodeBlockHtmlAdapterExtension,
-  DividerBlockHtmlAdapterExtension,
-  ImageBlockHtmlAdapterExtension,
-  RootBlockHtmlAdapterExtension,
-  EmbedYoutubeBlockHtmlAdapterExtension,
-  EmbedFigmaBlockHtmlAdapterExtension,
-  EmbedLoomBlockHtmlAdapterExtension,
-  EmbedGithubBlockHtmlAdapterExtension,
-  BookmarkBlockHtmlAdapterExtension,
-  DatabaseBlockHtmlAdapterExtension,
-  EmbedLinkedDocHtmlAdapterExtension,
-  EmbedSyncedDocBlockHtmlAdapterExtension,
-];

blocksuite/blocks/src/_common/adapters/html-adapter/index.ts

@@ -1,7 +1,4 @@
-export {
-  BlockHtmlAdapterExtensions,
-  defaultBlockHtmlAdapterMatchers,
-} from './block-matcher.js';
+export { defaultBlockHtmlAdapterMatchers } from './block-matcher.js';
 export {
   HtmlAdapter,
   HtmlAdapterFactoryExtension,

blocksuite/blocks/src/_common/adapters/index.ts

@@ -1,4 +1,5 @@
 export * from './attachment.js';
+export * from './extension.js';
 export * from './html-adapter/html.js';
 export * from './image.js';
 export * from './markdown/index.js';

blocksuite/blocks/src/_common/adapters/markdown/block-matcher.ts

@@ -1,55 +1,21 @@
 import {
   embedFigmaBlockMarkdownAdapterMatcher,
-  EmbedFigmaMarkdownAdapterExtension,
   embedGithubBlockMarkdownAdapterMatcher,
-  EmbedGithubMarkdownAdapterExtension,
   embedLinkedDocBlockMarkdownAdapterMatcher,
-  EmbedLinkedDocMarkdownAdapterExtension,
   embedLoomBlockMarkdownAdapterMatcher,
-  EmbedLoomMarkdownAdapterExtension,
-  EmbedSyncedDocBlockMarkdownAdapterExtension,
   embedSyncedDocBlockMarkdownAdapterMatcher,
   embedYoutubeBlockMarkdownAdapterMatcher,
-  EmbedYoutubeMarkdownAdapterExtension,
 } from '@blocksuite/affine-block-embed';
-import {
-  ListBlockMarkdownAdapterExtension,
-  listBlockMarkdownAdapterMatcher,
-} from '@blocksuite/affine-block-list';
-import {
-  ParagraphBlockMarkdownAdapterExtension,
-  paragraphBlockMarkdownAdapterMatcher,
-} from '@blocksuite/affine-block-paragraph';
-import type { ExtensionType } from '@blocksuite/block-std';
+import { listBlockMarkdownAdapterMatcher } from '@blocksuite/affine-block-list';
+import { paragraphBlockMarkdownAdapterMatcher } from '@blocksuite/affine-block-paragraph';
 
-import {
-  BookmarkBlockMarkdownAdapterExtension,
-  bookmarkBlockMarkdownAdapterMatcher,
-} from '../../../bookmark-block/adapters/markdown.js';
-import {
-  CodeBlockMarkdownAdapterExtension,
-  codeBlockMarkdownAdapterMatcher,
-} from '../../../code-block/adapters/markdown.js';
-import {
-  DatabaseBlockMarkdownAdapterExtension,
-  databaseBlockMarkdownAdapterMatcher,
-} from '../../../database-block/adapters/markdown.js';
-import {
-  DividerBlockMarkdownAdapterExtension,
-  dividerBlockMarkdownAdapterMatcher,
-} from '../../../divider-block/adapters/markdown.js';
-import {
-  ImageBlockMarkdownAdapterExtension,
-  imageBlockMarkdownAdapterMatcher,
-} from '../../../image-block/adapters/markdown.js';
-import {
-  LatexBlockMarkdownAdapterExtension,
-  latexBlockMarkdownAdapterMatcher,
-} from '../../../latex-block/adapters/markdown.js';
-import {
-  RootBlockMarkdownAdapterExtension,
-  rootBlockMarkdownAdapterMatcher,
-} from '../../../root-block/adapters/markdown.js';
+import { bookmarkBlockMarkdownAdapterMatcher } from '../../../bookmark-block/adapters/markdown.js';
+import { codeBlockMarkdownAdapterMatcher } from '../../../code-block/adapters/markdown.js';
+import { databaseBlockMarkdownAdapterMatcher } from '../../../database-block/adapters/markdown.js';
+import { dividerBlockMarkdownAdapterMatcher } from '../../../divider-block/adapters/markdown.js';
+import { imageBlockMarkdownAdapterMatcher } from '../../../image-block/adapters/markdown.js';
+import { latexBlockMarkdownAdapterMatcher } from '../../../latex-block/adapters/markdown.js';
+import { rootBlockMarkdownAdapterMatcher } from '../../../root-block/adapters/markdown.js';
 
 export const defaultBlockMarkdownAdapterMatchers = [
   embedFigmaBlockMarkdownAdapterMatcher,
@@ -68,21 +34,3 @@ export const defaultBlockMarkdownAdapterMatchers = [
   latexBlockMarkdownAdapterMatcher,
   rootBlockMarkdownAdapterMatcher,
 ];
-
-export const BlockMarkdownAdapterExtensions: ExtensionType[] = [
-  EmbedFigmaMarkdownAdapterExtension,
-  EmbedGithubMarkdownAdapterExtension,
-  EmbedLinkedDocMarkdownAdapterExtension,
-  EmbedLoomMarkdownAdapterExtension,
-  EmbedSyncedDocBlockMarkdownAdapterExtension,
-  EmbedYoutubeMarkdownAdapterExtension,
-  ListBlockMarkdownAdapterExtension,
-  ParagraphBlockMarkdownAdapterExtension,
-  BookmarkBlockMarkdownAdapterExtension,
-  CodeBlockMarkdownAdapterExtension,
-  DatabaseBlockMarkdownAdapterExtension,
-  DividerBlockMarkdownAdapterExtension,
-  ImageBlockMarkdownAdapterExtension,
-  LatexBlockMarkdownAdapterExtension,
-  RootBlockMarkdownAdapterExtension,
-];

blocksuite/blocks/src/_common/adapters/markdown/index.ts

@@ -1,7 +1,4 @@
-export {
-  BlockMarkdownAdapterExtensions,
-  defaultBlockMarkdownAdapterMatchers,
-} from './block-matcher.js';
+export { defaultBlockMarkdownAdapterMatchers } from './block-matcher.js';
 export {
   MarkdownAdapter,
   MarkdownAdapterFactoryExtension,

blocksuite/blocks/src/_common/adapters/notion-html/block-matcher.ts

@@ -1,46 +1,15 @@
-import {
-  ListBlockNotionHtmlAdapterExtension,
-  listBlockNotionHtmlAdapterMatcher,
-} from '@blocksuite/affine-block-list';
-import {
-  ParagraphBlockNotionHtmlAdapterExtension,
-  paragraphBlockNotionHtmlAdapterMatcher,
-} from '@blocksuite/affine-block-paragraph';
+import { listBlockNotionHtmlAdapterMatcher } from '@blocksuite/affine-block-list';
+import { paragraphBlockNotionHtmlAdapterMatcher } from '@blocksuite/affine-block-paragraph';
 import type { BlockNotionHtmlAdapterMatcher } from '@blocksuite/affine-shared/adapters';
-import type { ExtensionType } from '@blocksuite/block-std';
 
-import {
-  AttachmentBlockNotionHtmlAdapterExtension,
-  attachmentBlockNotionHtmlAdapterMatcher,
-} from '../../../attachment-block/adapters/notion-html.js';
-import {
-  BookmarkBlockNotionHtmlAdapterExtension,
-  bookmarkBlockNotionHtmlAdapterMatcher,
-} from '../../../bookmark-block/adapters/notion-html.js';
-import {
-  CodeBlockNotionHtmlAdapterExtension,
-  codeBlockNotionHtmlAdapterMatcher,
-} from '../../../code-block/adapters/notion-html.js';
-import {
-  DatabaseBlockNotionHtmlAdapterExtension,
-  databaseBlockNotionHtmlAdapterMatcher,
-} from '../../../database-block/adapters/notion-html.js';
-import {
-  DividerBlockNotionHtmlAdapterExtension,
-  dividerBlockNotionHtmlAdapterMatcher,
-} from '../../../divider-block/adapters/notion-html.js';
-import {
-  ImageBlockNotionHtmlAdapterExtension,
-  imageBlockNotionHtmlAdapterMatcher,
-} from '../../../image-block/adapters/notion-html.js';
-import {
-  LatexBlockNotionHtmlAdapterExtension,
-  latexBlockNotionHtmlAdapterMatcher,
-} from '../../../latex-block/adapters/notion-html.js';
-import {
-  RootBlockNotionHtmlAdapterExtension,
-  rootBlockNotionHtmlAdapterMatcher,
-} from '../../../root-block/adapters/notion-html.js';
+import { attachmentBlockNotionHtmlAdapterMatcher } from '../../../attachment-block/adapters/notion-html.js';
+import { bookmarkBlockNotionHtmlAdapterMatcher } from '../../../bookmark-block/adapters/notion-html.js';
+import { codeBlockNotionHtmlAdapterMatcher } from '../../../code-block/adapters/notion-html.js';
+import { databaseBlockNotionHtmlAdapterMatcher } from '../../../database-block/adapters/notion-html.js';
+import { dividerBlockNotionHtmlAdapterMatcher } from '../../../divider-block/adapters/notion-html.js';
+import { imageBlockNotionHtmlAdapterMatcher } from '../../../image-block/adapters/notion-html.js';
+import { latexBlockNotionHtmlAdapterMatcher } from '../../../latex-block/adapters/notion-html.js';
+import { rootBlockNotionHtmlAdapterMatcher } from '../../../root-block/adapters/notion-html.js';
 
 export const defaultBlockNotionHtmlAdapterMatchers: BlockNotionHtmlAdapterMatcher[] =
   [
@@ -55,16 +24,3 @@ export const defaultBlockNotionHtmlAdapterMatchers: BlockNotionHtmlAdapterMatche
     attachmentBlockNotionHtmlAdapterMatcher,
     latexBlockNotionHtmlAdapterMatcher,
   ];
-
-export const BlockNotionHtmlAdapterExtensions: ExtensionType[] = [
-  ListBlockNotionHtmlAdapterExtension,
-  ParagraphBlockNotionHtmlAdapterExtension,
-  CodeBlockNotionHtmlAdapterExtension,
-  DividerBlockNotionHtmlAdapterExtension,
-  ImageBlockNotionHtmlAdapterExtension,
-  RootBlockNotionHtmlAdapterExtension,
-  BookmarkBlockNotionHtmlAdapterExtension,
-  DatabaseBlockNotionHtmlAdapterExtension,
-  AttachmentBlockNotionHtmlAdapterExtension,
-  LatexBlockNotionHtmlAdapterExtension,
-];

blocksuite/blocks/src/_common/adapters/notion-html/index.ts

@@ -1,7 +1,4 @@
-export {
-  BlockNotionHtmlAdapterExtensions,
-  defaultBlockNotionHtmlAdapterMatchers,
-} from './block-matcher.js';
+export { defaultBlockNotionHtmlAdapterMatchers } from './block-matcher.js';
 export {
   NotionHtmlAdapter,
   NotionHtmlAdapterFactoryExtension,

blocksuite/blocks/src/_common/adapters/plain-text/block-matcher.ts

@@ -1,44 +1,19 @@
 import {
-  EmbedFigmaBlockPlainTextAdapterExtension,
   embedFigmaBlockPlainTextAdapterMatcher,
-  EmbedGithubBlockPlainTextAdapterExtension,
   embedGithubBlockPlainTextAdapterMatcher,
-  EmbedLinkedDocBlockPlainTextAdapterExtension,
   embedLinkedDocBlockPlainTextAdapterMatcher,
-  EmbedLoomBlockPlainTextAdapterExtension,
   embedLoomBlockPlainTextAdapterMatcher,
-  EmbedSyncedDocBlockPlainTextAdapterExtension,
   embedSyncedDocBlockPlainTextAdapterMatcher,
-  EmbedYoutubeBlockPlainTextAdapterExtension,
   embedYoutubeBlockPlainTextAdapterMatcher,
 } from '@blocksuite/affine-block-embed';
-import {
-  ListBlockPlainTextAdapterExtension,
-  listBlockPlainTextAdapterMatcher,
-} from '@blocksuite/affine-block-list';
-import {
-  ParagraphBlockPlainTextAdapterExtension,
-  paragraphBlockPlainTextAdapterMatcher,
-} from '@blocksuite/affine-block-paragraph';
+import { listBlockPlainTextAdapterMatcher } from '@blocksuite/affine-block-list';
+import { paragraphBlockPlainTextAdapterMatcher } from '@blocksuite/affine-block-paragraph';
 import type { BlockPlainTextAdapterMatcher } from '@blocksuite/affine-shared/adapters';
-import type { ExtensionType } from '@blocksuite/block-std';
 
-import {
-  BookmarkBlockPlainTextAdapterExtension,
-  bookmarkBlockPlainTextAdapterMatcher,
-} from '../../../bookmark-block/adapters/plain-text.js';
-import {
-  CodeBlockPlainTextAdapterExtension,
-  codeBlockPlainTextAdapterMatcher,
-} from '../../../code-block/adapters/plain-text.js';
-import {
-  DividerBlockPlainTextAdapterExtension,
-  dividerBlockPlainTextAdapterMatcher,
-} from '../../../divider-block/adapters/plain-text.js';
-import {
-  LatexBlockPlainTextAdapterExtension,
-  latexBlockPlainTextAdapterMatcher,
-} from '../../../latex-block/adapters/plain-text.js';
+import { bookmarkBlockPlainTextAdapterMatcher } from '../../../bookmark-block/adapters/plain-text.js';
+import { codeBlockPlainTextAdapterMatcher } from '../../../code-block/adapters/plain-text.js';
+import { dividerBlockPlainTextAdapterMatcher } from '../../../divider-block/adapters/plain-text.js';
+import { latexBlockPlainTextAdapterMatcher } from '../../../latex-block/adapters/plain-text.js';
 
 export const defaultBlockPlainTextAdapterMatchers: BlockPlainTextAdapterMatcher[] =
   [
@@ -55,18 +30,3 @@ export const defaultBlockPlainTextAdapterMatchers: BlockPlainTextAdapterMatcher[
     embedSyncedDocBlockPlainTextAdapterMatcher,
     latexBlockPlainTextAdapterMatcher,
   ];
-
-export const BlockPlainTextAdapterExtensions: ExtensionType[] = [
-  ParagraphBlockPlainTextAdapterExtension,
-  ListBlockPlainTextAdapterExtension,
-  DividerBlockPlainTextAdapterExtension,
-  CodeBlockPlainTextAdapterExtension,
-  BookmarkBlockPlainTextAdapterExtension,
-  EmbedFigmaBlockPlainTextAdapterExtension,
-  EmbedGithubBlockPlainTextAdapterExtension,
-  EmbedLoomBlockPlainTextAdapterExtension,
-  EmbedYoutubeBlockPlainTextAdapterExtension,
-  EmbedLinkedDocBlockPlainTextAdapterExtension,
-  EmbedSyncedDocBlockPlainTextAdapterExtension,
-  LatexBlockPlainTextAdapterExtension,
-];

blocksuite/blocks/src/_specs/common.ts

@@ -5,10 +5,7 @@ import { RichTextExtensions } from '@blocksuite/affine-components/rich-text';
 import { EditPropsStore } from '@blocksuite/affine-shared/services';
 import type { ExtensionType } from '@blocksuite/block-std';
 
-import {
-  AdapterFactoryExtensions,
-  BlockAdapterMatcherExtensions,
-} from '../_common/adapters/extension.js';
+import { AdapterFactoryExtensions } from '../_common/adapters/extension.js';
 import { AttachmentBlockSpec } from '../attachment-block/attachment-spec.js';
 import { BookmarkBlockSpec } from '../bookmark-block/bookmark-spec.js';
 import { CodeBlockSpec } from '../code-block/code-block-spec.js';
@@ -35,7 +32,6 @@ export const CommonFirstPartyBlockSpecs: ExtensionType[] = [
   BookmarkBlockSpec,
   AttachmentBlockSpec,
   EmbedExtensions,
-  BlockAdapterMatcherExtensions,
   AdapterFactoryExtensions,
 ].flat();
 
@@ -53,6 +49,5 @@ export const EdgelessFirstPartyBlockSpecs: ExtensionType[] = [
   BookmarkBlockSpec,
   AttachmentBlockSpec,
   EmbedExtensions,
-  BlockAdapterMatcherExtensions,
   AdapterFactoryExtensions,
 ].flat();

blocksuite/blocks/src/attachment-block/attachment-spec.ts

@@ -5,6 +5,7 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { AttachmentBlockNotionHtmlAdapterExtension } from './adapters/notion-html.js';
 import {
   AttachmentBlockService,
   AttachmentDragHandleOption,
@@ -25,4 +26,5 @@ export const AttachmentBlockSpec: ExtensionType[] = [
   AttachmentDragHandleOption,
   AttachmentEmbedConfigExtension(),
   AttachmentEmbedService,
+  AttachmentBlockNotionHtmlAdapterExtension,
 ];

blocksuite/blocks/src/bookmark-block/adapters/extension.ts

@@ -0,0 +1,13 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { BookmarkBlockHtmlAdapterExtension } from './html.js';
+import { BookmarkBlockMarkdownAdapterExtension } from './markdown.js';
+import { BookmarkBlockNotionHtmlAdapterExtension } from './notion-html.js';
+import { BookmarkBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const BookmarkBlockAdapterExtensions: ExtensionType[] = [
+  BookmarkBlockHtmlAdapterExtension,
+  BookmarkBlockMarkdownAdapterExtension,
+  BookmarkBlockNotionHtmlAdapterExtension,
+  BookmarkBlockPlainTextAdapterExtension,
+];

blocksuite/blocks/src/bookmark-block/bookmark-spec.ts

@@ -6,6 +6,7 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { BookmarkBlockAdapterExtensions } from './adapters/extension.js';
 import {
   BookmarkBlockService,
   BookmarkDragHandleOption,
@@ -22,4 +23,5 @@ export const BookmarkBlockSpec: ExtensionType[] = [
       : literal`affine-bookmark`;
   }),
   BookmarkDragHandleOption,
-];
+  BookmarkBlockAdapterExtensions,
+].flat();

blocksuite/blocks/src/code-block/adapters/extension.ts

@@ -0,0 +1,13 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { CodeBlockHtmlAdapterExtension } from './html.js';
+import { CodeBlockMarkdownAdapterExtension } from './markdown.js';
+import { CodeBlockNotionHtmlAdapterExtension } from './notion-html.js';
+import { CodeBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const CodeBlockAdapterExtensions: ExtensionType[] = [
+  CodeBlockHtmlAdapterExtension,
+  CodeBlockMarkdownAdapterExtension,
+  CodeBlockPlainTextAdapterExtension,
+  CodeBlockNotionHtmlAdapterExtension,
+];

blocksuite/blocks/src/code-block/code-block-spec.ts

@@ -7,6 +7,7 @@ import {
 import { literal, unsafeStatic } from 'lit/static-html.js';
 
 import { AFFINE_CODE_TOOLBAR_WIDGET } from '../root-block/widgets/code-toolbar/index.js';
+import { CodeBlockAdapterExtensions } from './adapters/extension.js';
 import {
   CodeBlockInlineManagerExtension,
   CodeBlockUnitSpecExtension,
@@ -22,4 +23,5 @@ export const CodeBlockSpec: ExtensionType[] = [
   }),
   CodeBlockInlineManagerExtension,
   CodeBlockUnitSpecExtension,
-];
+  CodeBlockAdapterExtensions,
+].flat();

blocksuite/blocks/src/database-block/adapters/extension.ts

@@ -0,0 +1,11 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { DatabaseBlockHtmlAdapterExtension } from './html.js';
+import { DatabaseBlockMarkdownAdapterExtension } from './markdown.js';
+import { DatabaseBlockNotionHtmlAdapterExtension } from './notion-html.js';
+
+export const DatabaseBlockAdapterExtensions: ExtensionType[] = [
+  DatabaseBlockHtmlAdapterExtension,
+  DatabaseBlockMarkdownAdapterExtension,
+  DatabaseBlockNotionHtmlAdapterExtension,
+];

blocksuite/blocks/src/database-block/database-spec.ts

@@ -7,6 +7,7 @@ import {
 import { DatabaseSelectionExtension } from '@blocksuite/data-view';
 import { literal } from 'lit/static-html.js';
 
+import { DatabaseBlockAdapterExtensions } from './adapters/extension.js';
 import { commands } from './commands.js';
 import { DatabaseDragHandleOption } from './config.js';
 import { DatabaseBlockService } from './database-service.js';
@@ -18,4 +19,5 @@ export const DatabaseBlockSpec: ExtensionType[] = [
   BlockViewExtension('affine:database', literal`affine-database`),
   DatabaseDragHandleOption,
   DatabaseSelectionExtension,
-];
+  DatabaseBlockAdapterExtensions,
+].flat();

blocksuite/blocks/src/divider-block/adapters/extension.ts

@@ -0,0 +1,13 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { DividerBlockHtmlAdapterExtension } from './html.js';
+import { DividerBlockMarkdownAdapterExtension } from './markdown.js';
+import { DividerBlockNotionHtmlAdapterExtension } from './notion-html.js';
+import { DividerBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const DividerBlockAdapterExtensions: ExtensionType[] = [
+  DividerBlockHtmlAdapterExtension,
+  DividerBlockMarkdownAdapterExtension,
+  DividerBlockNotionHtmlAdapterExtension,
+  DividerBlockPlainTextAdapterExtension,
+];

blocksuite/blocks/src/divider-block/divider-spec.ts

@@ -1,6 +1,9 @@
 import { BlockViewExtension, type ExtensionType } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { DividerBlockAdapterExtensions } from './adapters/extension.js';
+
 export const DividerBlockSpec: ExtensionType[] = [
   BlockViewExtension('affine:divider', literal`affine-divider`),
-];
+  DividerBlockAdapterExtensions,
+].flat();

blocksuite/blocks/src/image-block/adapters/extension.ts

@@ -0,0 +1,11 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { ImageBlockHtmlAdapterExtension } from './html.js';
+import { ImageBlockMarkdownAdapterExtension } from './markdown.js';
+import { ImageBlockNotionHtmlAdapterExtension } from './notion-html.js';
+
+export const ImageBlockAdapterExtensions: ExtensionType[] = [
+  ImageBlockHtmlAdapterExtension,
+  ImageBlockMarkdownAdapterExtension,
+  ImageBlockNotionHtmlAdapterExtension,
+];

blocksuite/blocks/src/image-block/image-spec.ts

@@ -8,6 +8,7 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { ImageBlockAdapterExtensions } from './adapters/extension.js';
 import { commands } from './commands/index.js';
 import { ImageBlockService, ImageDragHandleOption } from './image-service.js';
 
@@ -29,4 +30,5 @@ export const ImageBlockSpec: ExtensionType[] = [
   }),
   ImageDragHandleOption,
   ImageSelectionExtension,
-];
+  ImageBlockAdapterExtensions,
+].flat();

blocksuite/blocks/src/latex-block/adapters/extension.ts

@@ -0,0 +1,11 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { LatexBlockMarkdownAdapterExtension } from './markdown.js';
+import { LatexBlockNotionHtmlAdapterExtension } from './notion-html.js';
+import { LatexBlockPlainTextAdapterExtension } from './plain-text.js';
+
+export const LatexBlockAdapterExtensions: ExtensionType[] = [
+  LatexBlockMarkdownAdapterExtension,
+  LatexBlockNotionHtmlAdapterExtension,
+  LatexBlockPlainTextAdapterExtension,
+];

blocksuite/blocks/src/latex-block/latex-spec.ts

@@ -5,9 +5,11 @@ import {
 } from '@blocksuite/block-std';
 import { literal } from 'lit/static-html.js';
 
+import { LatexBlockAdapterExtensions } from './adapters/extension.js';
 import { commands } from './commands.js';
 
 export const LatexBlockSpec: ExtensionType[] = [
   BlockViewExtension('affine:latex', literal`affine-latex`),
   CommandExtension(commands),
-];
+  LatexBlockAdapterExtensions,
+].flat();

blocksuite/blocks/src/root-block/adapters/extension.ts

@@ -0,0 +1,11 @@
+import type { ExtensionType } from '@blocksuite/block-std';
+
+import { RootBlockHtmlAdapterExtension } from './html.js';
+import { RootBlockMarkdownAdapterExtension } from './markdown.js';
+import { RootBlockNotionHtmlAdapterExtension } from './notion-html.js';
+
+export const RootBlockAdapterExtensions: ExtensionType[] = [
+  RootBlockHtmlAdapterExtension,
+  RootBlockMarkdownAdapterExtension,
+  RootBlockNotionHtmlAdapterExtension,
+];

blocksuite/blocks/src/root-block/edgeless/edgeless-root-spec.ts

@@ -18,6 +18,7 @@ import { ToolController } from '@blocksuite/block-std/gfx';
 import { literal, unsafeStatic } from 'lit/static-html.js';
 
 import { ExportManagerExtension } from '../../_common/export-manager/export-manager.js';
+import { RootBlockAdapterExtensions } from '../adapters/extension.js';
 import { commands } from '../commands/index.js';
 import { AFFINE_DOC_REMOTE_SELECTION_WIDGET } from '../widgets/doc-remote-selection/doc-remote-selection.js';
 import { AFFINE_DRAG_HANDLE_WIDGET } from '../widgets/drag-handle/consts.js';
@@ -96,7 +97,8 @@ const EdgelessCommonExtension: ExtensionType[] = [
   ToolController,
   DNDAPIExtension,
   DocDisplayMetaService,
-];
+  RootBlockAdapterExtensions,
+].flat();
 
 export const EdgelessRootBlockSpec: ExtensionType[] = [
   ...EdgelessCommonExtension,

blocksuite/blocks/src/root-block/page/page-root-spec.ts

@@ -16,6 +16,7 @@ import {
 import { literal, unsafeStatic } from 'lit/static-html.js';
 
 import { ExportManagerExtension } from '../../_common/export-manager/export-manager.js';
+import { RootBlockAdapterExtensions } from '../adapters/extension.js';
 import { commands } from '../commands/index.js';
 import { AFFINE_DOC_REMOTE_SELECTION_WIDGET } from '../widgets/doc-remote-selection/doc-remote-selection.js';
 import { AFFINE_DRAG_HANDLE_WIDGET } from '../widgets/drag-handle/consts.js';
@@ -73,4 +74,5 @@ export const PageRootBlockSpec: ExtensionType[] = [
   ExportManagerExtension,
   DNDAPIExtension,
   DocDisplayMetaService,
-];
+  RootBlockAdapterExtensions,
+].flat();