refactor(editor): surface markdown adapter extensionalize (#9560)

[BS-2212](https://linear.app/affine-design/issue/BS-2212/adapter-extension化修复)

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

@@ -1,3 +1,4 @@
+import { elementToMarkdownAdapterMatchers } from './markdown/element-adapter/elements/index.js';
 import {
   EdgelessSurfaceBlockMarkdownAdapterExtension,
   SurfaceBlockMarkdownAdapterExtension,
@@ -10,12 +11,14 @@ import {
 
 export const SurfaceBlockAdapterExtensions = [
   ...elementToPlainTextAdapterMatchers,
+  ...elementToMarkdownAdapterMatchers,
   SurfaceBlockPlainTextAdapterExtension,
   SurfaceBlockMarkdownAdapterExtension,
 ];
 
 export const EdgelessSurfaceBlockAdapterExtensions = [
   ...elementToPlainTextAdapterMatchers,
+  ...elementToMarkdownAdapterMatchers,
   EdgelessSurfaceBlockPlainTextAdapterExtension,
   EdgelessSurfaceBlockMarkdownAdapterExtension,
 ];

blocksuite/affine/block-surface/src/adapters/markdown/element-adapter/elements/brush.ts

@@ -1,7 +1,6 @@
-import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';
+import { ElementToMarkdownAdapterExtension } from '../type.js';
 
-export const brushToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
+export const brushToMarkdownAdapterMatcher = ElementToMarkdownAdapterExtension({
-  {
   name: 'brush',
   match: elementModel => elementModel.type === 'brush',
   toAST: () => {
@@ -16,4 +15,4 @@ export const brushToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher
       ],
     };
   },
-  };
+});

blocksuite/affine/block-surface/src/adapters/markdown/element-adapter/elements/connector.ts

@@ -1,8 +1,8 @@
 import { getConnectorText } from '../../../utils/text.js';
-import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';
+import { ElementToMarkdownAdapterExtension } from '../type.js';
 
-export const connectorToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
+export const connectorToMarkdownAdapterMatcher =
-  {
+  ElementToMarkdownAdapterExtension({
     name: 'connector',
     match: elementModel => elementModel.type === 'connector',
     toAST: elementModel => {
@@ -22,4 +22,4 @@ export const connectorToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMat
         ],
       };
     },
-  };
+  });

blocksuite/affine/block-surface/src/adapters/markdown/element-adapter/elements/group.ts

@@ -1,8 +1,7 @@
 import { getGroupTitle } from '../../../utils/text.js';
-import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';
+import { ElementToMarkdownAdapterExtension } from '../type.js';
 
-export const groupToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
+export const groupToMarkdownAdapterMatcher = ElementToMarkdownAdapterExtension({
-  {
   name: 'group',
   match: elementModel => elementModel.type === 'group',
   toAST: elementModel => {
@@ -22,4 +21,4 @@ export const groupToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher
       ],
     };
   },
-  };
+});

blocksuite/affine/block-surface/src/adapters/markdown/element-adapter/elements/mindmap.ts

@@ -1,10 +1,10 @@
 import type { MindMapTreeNode } from '../../../types/mindmap.js';
 import { buildMindMapTree } from '../../../utils/mindmap.js';
 import { getShapeText } from '../../../utils/text.js';
-import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';
+import { ElementToMarkdownAdapterExtension } from '../type.js';
 
-export const mindmapToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
+export const mindmapToMarkdownAdapterMatcher =
-  {
+  ElementToMarkdownAdapterExtension({
     name: 'mindmap',
     match: elementModel => elementModel.type === 'mindmap',
     toAST: (elementModel, context) => {
@@ -64,4 +64,4 @@ export const mindmapToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatch
 
       return null;
     },
-  };
+  });

blocksuite/affine/block-surface/src/adapters/markdown/element-adapter/elements/shape.ts

@@ -1,9 +1,8 @@
 import type { MindMapTreeNode } from '../../../types/mindmap.js';
 import { getShapeText, getShapeType } from '../../../utils/text.js';
-import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';
+import { ElementToMarkdownAdapterExtension } from '../type.js';
 
-export const shapeToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
+export const shapeToMarkdownAdapterMatcher = ElementToMarkdownAdapterExtension({
-  {
   name: 'shape',
   match: elementModel => elementModel.type === 'shape',
   toAST: (elementModel, context) => {
@@ -43,4 +42,4 @@ export const shapeToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher
       ],
     };
   },
-  };
+});

blocksuite/affine/block-surface/src/adapters/markdown/element-adapter/elements/text.ts

@@ -1,8 +1,7 @@
 import { getTextElementText } from '../../../utils/text.js';
-import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';
+import { ElementToMarkdownAdapterExtension } from '../type.js';
 
-export const textToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
+export const textToMarkdownAdapterMatcher = ElementToMarkdownAdapterExtension({
-  {
   name: 'text',
   match: elementModel => elementModel.type === 'text',
   toAST: elementModel => {
@@ -21,4 +20,4 @@ export const textToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher
       ],
     };
   },
-  };
+});

blocksuite/affine/block-surface/src/adapters/markdown/element-adapter/index.ts

@@ -4,15 +4,14 @@ import {
   ElementModelAdapter,
   type ElementModelAdapterContext,
 } from '../../type.js';
-import { elementToMarkdownAdapterMatchers } from './elements/index.js';
+import type { ElementToMarkdownAdapterMatcher } from './type.js';
-import type { ElementModelToMarkdownAdapterMatcher } from './type.js';
 
 export class MarkdownElementModelAdapter extends ElementModelAdapter<
   MarkdownAST,
   MarkdownAST
 > {
   constructor(
-    readonly elementModelMatchers: ElementModelToMarkdownAdapterMatcher[] = elementToMarkdownAdapterMatchers
+    readonly elementModelMatchers: ElementToMarkdownAdapterMatcher[]
   ) {
     super();
   }

blocksuite/affine/block-surface/src/adapters/markdown/element-adapter/type.ts

@@ -1,6 +1,29 @@
+import type { ExtensionType } from '@blocksuite/affine/store';
 import type { MarkdownAST } from '@blocksuite/affine-shared/adapters';
+import {
+  createIdentifier,
+  type ServiceIdentifier,
+} from '@blocksuite/global/di';
 
 import type { ElementModelMatcher } from '../../type.js';
 
-export type ElementModelToMarkdownAdapterMatcher =
+export type ElementToMarkdownAdapterMatcher = ElementModelMatcher<MarkdownAST>;
-  ElementModelMatcher<MarkdownAST>;
+
+export const ElementToMarkdownAdapterMatcherIdentifier =
+  createIdentifier<ElementToMarkdownAdapterMatcher>(
+    'elementToMarkdownAdapterMatcher'
+  );
+
+export function ElementToMarkdownAdapterExtension(
+  matcher: ElementToMarkdownAdapterMatcher
+): ExtensionType & {
+  identifier: ServiceIdentifier<ElementToMarkdownAdapterMatcher>;
+} {
+  const identifier = ElementToMarkdownAdapterMatcherIdentifier(matcher.name);
+  return {
+    setup: di => {
+      di.addImpl(identifier, () => matcher);
+    },
+    identifier,
+  };
+}

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

@@ -5,6 +5,7 @@ import {
 
 import { getMindMapNodeMap } from '../utils/mindmap.js';
 import { MarkdownElementModelAdapter } from './element-adapter/index.js';
+import { ElementToMarkdownAdapterMatcherIdentifier } from './element-adapter/type.js';
 
 export const surfaceBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMatcher = {
   flavour: 'affine:surface',
@@ -29,8 +30,18 @@ export const edgelessSurfaceBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMat
     toBlockSnapshot: {},
     fromBlockSnapshot: {
       enter: (o, context) => {
-        const { walkerContext } = context;
+        const { walkerContext, provider } = context;
-        const markdownElementModelAdapter = new MarkdownElementModelAdapter();
+        if (!provider) {
+          context.walkerContext.skipAllChildren();
+          return;
+        }
+
+        const elementModelMatchers = Array.from(
+          provider.getAll(ElementToMarkdownAdapterMatcherIdentifier).values()
+        );
+        const markdownElementModelAdapter = new MarkdownElementModelAdapter(
+          elementModelMatchers
+        );
         if ('elements' in o.node.props) {
           const elements = o.node.props.elements as Record<
             string,

blocksuite/affine/shared/src/adapters/markdown/markdown.ts

@@ -72,6 +72,7 @@ export class MarkdownAdapter extends BaseAdapter<Markdown> {
             configs: this.configs,
             job: this.job,
             deltaConverter: this.deltaConverter,
+            provider: this.provider,
             textBuffer: { content: '' },
             assets,
           };
@@ -92,6 +93,7 @@ export class MarkdownAdapter extends BaseAdapter<Markdown> {
             configs: this.configs,
             job: this.job,
             deltaConverter: this.deltaConverter,
+            provider: this.provider,
             textBuffer: { content: '' },
             assets,
           };
@@ -126,6 +128,7 @@ export class MarkdownAdapter extends BaseAdapter<Markdown> {
             configs: this.configs,
             job: this.job,
             deltaConverter: this.deltaConverter,
+            provider: this.provider,
             textBuffer: { content: '' },
             assets,
             updateAssetIds: (assetsId: string) => {
@@ -149,6 +152,7 @@ export class MarkdownAdapter extends BaseAdapter<Markdown> {
             configs: this.configs,
             job: this.job,
             deltaConverter: this.deltaConverter,
+            provider: this.provider,
             textBuffer: { content: '' },
             assets,
           };
@@ -166,7 +170,10 @@ export class MarkdownAdapter extends BaseAdapter<Markdown> {
 
   readonly blockMatchers: BlockMarkdownAdapterMatcher[];
 
-  constructor(job: Job, provider: ServiceProvider) {
+  constructor(
+    job: Job,
+    readonly provider: ServiceProvider
+  ) {
     super(job);
     const blockMatchers = Array.from(
       provider.getAll(BlockMarkdownAdapterMatcherIdentifier).values()