Skip to content

Commit

Permalink
feat(blocks): add markdown adapter for surface elements (#9017)
Browse files Browse the repository at this point in the history
  • Loading branch information
donteatfriedrice committed Dec 19, 2024
1 parent 09ffcf2 commit c64d99f
Show file tree
Hide file tree
Showing 20 changed files with 518 additions and 110 deletions.
6 changes: 6 additions & 0 deletions packages/affine/block-surface/src/adapters/extension.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import {
EdgelessSurfaceBlockMarkdownAdapterExtension,
SurfaceBlockMarkdownAdapterExtension,
} from './markdown/markdown.js';
import {
EdgelessSurfaceBlockPlainTextAdapterExtension,
SurfaceBlockPlainTextAdapterExtension,
} from './plain-text/plain-text.js';

export const SurfaceBlockAdapterExtensions = [
SurfaceBlockPlainTextAdapterExtension,
SurfaceBlockMarkdownAdapterExtension,
];

export const EdgelessSurfaceBlockAdapterExtensions = [
EdgelessSurfaceBlockPlainTextAdapterExtension,
EdgelessSurfaceBlockMarkdownAdapterExtension,
];
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';

export const brushToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
{
name: 'brush',
match: elementModel => elementModel.type === 'brush',
toAST: () => {
const content = `Brush Stroke`;
return {
type: 'paragraph',
children: [
{
type: 'text',
value: content,
},
],
};
},
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';

import { getConnectorText } from '../../../utils/text.js';

export const connectorToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
{
name: 'connector',
match: elementModel => elementModel.type === 'connector',
toAST: elementModel => {
const text = getConnectorText(elementModel);
if (!text) {
return null;
}

const content = `Connector, with text label "${text}"`;
return {
type: 'paragraph',
children: [
{
type: 'text',
value: content,
},
],
};
},
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';

import { getGroupTitle } from '../../../utils/text.js';

export const groupToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
{
name: 'group',
match: elementModel => elementModel.type === 'group',
toAST: elementModel => {
const title = getGroupTitle(elementModel);
if (!title) {
return null;
}

const content = `Group, with title "${title}"`;
return {
type: 'paragraph',
children: [
{
type: 'text',
value: content,
},
],
};
},
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { brushToMarkdownAdapterMatcher } from './brush.js';
import { connectorToMarkdownAdapterMatcher } from './connector.js';
import { groupToMarkdownAdapterMatcher } from './group.js';
import { mindmapToMarkdownAdapterMatcher } from './mindmap.js';
import { shapeToMarkdownAdapterMatcher } from './shape.js';
import { textToMarkdownAdapterMatcher } from './text.js';

export const elementToMarkdownAdapterMatchers = [
groupToMarkdownAdapterMatcher,
shapeToMarkdownAdapterMatcher,
connectorToMarkdownAdapterMatcher,
brushToMarkdownAdapterMatcher,
textToMarkdownAdapterMatcher,
mindmapToMarkdownAdapterMatcher,
];
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import type { MindMapTreeNode } from '../../../types/mindmap.js';
import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';

import { buildMindMapTree } from '../../../utils/mindmap.js';
import { getShapeText } from '../../../utils/text.js';

export const mindmapToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
{
name: 'mindmap',
match: elementModel => elementModel.type === 'mindmap',
toAST: (elementModel, context) => {
if (elementModel.type !== 'mindmap') {
return null;
}

const mindMapTree = buildMindMapTree(elementModel);
if (!mindMapTree) {
return null;
}

const { walkerContext, elements } = context;
const traverseMindMapTree = (node: MindMapTreeNode) => {
const shapeElement = elements[node.id as string];
const shapeText = getShapeText(shapeElement);
walkerContext
.openNode(
{
type: 'listItem',
spread: false,
children: [],
},
'children'
)
.openNode(
{
type: 'paragraph',
children: [
{
type: 'text',
value: shapeText,
},
],
},
'children'
)
.closeNode();
node.children.forEach(child => {
traverseMindMapTree(child);
walkerContext.closeNode();
});
};

// First create a list node for the mind map tree
walkerContext.openNode(
{
type: 'list',
ordered: false,
spread: false,
children: [],
},
'children'
);
traverseMindMapTree(mindMapTree);
walkerContext.closeNode().closeNode();

return null;
},
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import type { MindMapTreeNode } from '../../../types/mindmap.js';
import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';

import { getShapeText, getShapeType } from '../../../utils/text.js';

export const shapeToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
{
name: 'shape',
match: elementModel => elementModel.type === 'shape',
toAST: (elementModel, context) => {
let content = '';
const { walkerContext } = context;
const mindMapNodeMaps = walkerContext.getGlobalContext(
'surface:mindMap:nodeMapArray'
) as Array<Map<string, MindMapTreeNode>>;
if (mindMapNodeMaps && mindMapNodeMaps.length > 0) {
// Check if the elementModel is a mindMap node
// If it is, we should return { content: '' } directly
// And get the content when we handle the whole mindMap
const isMindMapNode = mindMapNodeMaps.some(nodeMap =>
nodeMap.has(elementModel.id as string)
);
if (isMindMapNode) {
return null;
}
}

// If it is not, we should return the text and shapeType
const text = getShapeText(elementModel);
const type = getShapeType(elementModel);
if (!text && !type) {
return null;
}

const shapeType = type.charAt(0).toUpperCase() + type.slice(1);
content = `${shapeType}, with text label "${text}"`;
return {
type: 'paragraph',
children: [
{
type: 'text',
value: content,
},
],
};
},
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import type { ElementModelToMarkdownAdapterMatcher } from '../type.js';

import { getTextElementText } from '../../../utils/text.js';

export const textToMarkdownAdapterMatcher: ElementModelToMarkdownAdapterMatcher =
{
name: 'text',
match: elementModel => elementModel.type === 'text',
toAST: elementModel => {
const content = getTextElementText(elementModel);
if (!content) {
return null;
}

return {
type: 'paragraph',
children: [
{
type: 'text',
value: content,
},
],
};
},
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import type { MarkdownAST } from '@blocksuite/affine-shared/adapters';

import type { ElementModelToMarkdownAdapterMatcher } from './type.js';

import {
ElementModelAdapter,
type ElementModelAdapterContext,
} from '../../type.js';
import { elementToMarkdownAdapterMatchers } from './elements/index.js';

export class MarkdownElementModelAdapter extends ElementModelAdapter<
MarkdownAST,
MarkdownAST
> {
constructor(
readonly elementModelMatchers: ElementModelToMarkdownAdapterMatcher[] = elementToMarkdownAdapterMatchers
) {
super();
}

fromElementModel(
element: Record<string, unknown>,
context: ElementModelAdapterContext<MarkdownAST>
) {
const markdownAST: MarkdownAST | null = null;
for (const matcher of this.elementModelMatchers) {
if (matcher.match(element)) {
return matcher.toAST(element, context);
}
}
return markdownAST;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import type { MarkdownAST } from '@blocksuite/affine-shared/adapters';

import type { ElementModelMatcher } from '../../type.js';

export type ElementModelToMarkdownAdapterMatcher =
ElementModelMatcher<MarkdownAST>;
66 changes: 66 additions & 0 deletions packages/affine/block-surface/src/adapters/markdown/markdown.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import {
BlockMarkdownAdapterExtension,
type BlockMarkdownAdapterMatcher,
} from '@blocksuite/affine-shared/adapters';

import { SurfaceBlockSchema } from '../../surface-model.js';
import { getMindMapNodeMap } from '../utils/mindmap.js';
import { MarkdownElementModelAdapter } from './element-adapter/index.js';

export const surfaceBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMatcher = {
flavour: SurfaceBlockSchema.model.flavour,
toMatch: () => false,
fromMatch: o => o.node.flavour === SurfaceBlockSchema.model.flavour,
toBlockSnapshot: {},
fromBlockSnapshot: {
enter: (_, context) => {
context.walkerContext.skipAllChildren();
},
},
};

export const SurfaceBlockMarkdownAdapterExtension =
BlockMarkdownAdapterExtension(surfaceBlockMarkdownAdapterMatcher);

export const edgelessSurfaceBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMatcher =
{
flavour: SurfaceBlockSchema.model.flavour,
toMatch: () => false,
fromMatch: o => o.node.flavour === SurfaceBlockSchema.model.flavour,
toBlockSnapshot: {},
fromBlockSnapshot: {
enter: (o, context) => {
const { walkerContext } = context;
const markdownElementModelAdapter = new MarkdownElementModelAdapter();
if ('elements' in o.node.props) {
const elements = o.node.props.elements as Record<
string,
Record<string, unknown>
>;
// Get all the node maps of mindMap elements
const mindMapArray = Object.entries(elements)
.filter(([_, element]) => element.type === 'mindmap')
.map(([_, element]) => getMindMapNodeMap(element));
walkerContext.setGlobalContext(
'surface:mindMap:nodeMapArray',
mindMapArray
);

Object.entries(
o.node.props.elements as Record<string, Record<string, unknown>>
).forEach(([_, element]) => {
const markdownAST = markdownElementModelAdapter.fromElementModel(
element,
{ walkerContext, elements }
);
if (markdownAST) {
walkerContext.openNode(markdownAST, 'children').closeNode();
}
});
}
},
},
};

export const EdgelessSurfaceBlockMarkdownAdapterExtension =
BlockMarkdownAdapterExtension(edgelessSurfaceBlockMarkdownAdapterMatcher);
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
import type { DeltaInsert } from '@blocksuite/inline/types';

import type { ElementModelToPlainTextAdapterMatcher } from '../type.js';

import { getConnectorText } from '../../../utils/text.js';

export const connectorToPlainTextAdapterMatcher: ElementModelToPlainTextAdapterMatcher =
{
name: 'connector',
match: elementModel => elementModel.type === 'connector',
toAST: elementModel => {
let text = '';
if (
'text' in elementModel &&
typeof elementModel.text === 'object' &&
elementModel.text
) {
let delta: DeltaInsert[] = [];
if ('delta' in elementModel.text) {
delta = elementModel.text.delta as DeltaInsert[];
}
text = delta.map(d => d.insert).join('');
}
const text = getConnectorText(elementModel);
const content = `Connector, with text label "${text}"`;
return { content };
},
Expand Down
Loading

0 comments on commit c64d99f

Please sign in to comment.