Skip to content

fix(wysiwyg): fix serialization of yfm-cut and yfm-note #865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix(wysiwyg): fix serialization of yfm-cut and yfm-note #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b22f928
fix(YfmCut): fix serialization of yfm-cut
d3m1d0v Oct 13, 2025
a0c5b6d
fix(YfmNote): fix serialization of yfm-note
d3m1d0v Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 45 additions & 17 deletions src/extensions/yfm/YfmCut/YfmCutSpecs/serializer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import type {Node} from 'prosemirror-model';
import type {SerializerNodeToken} from '#core';
import type {Node} from '#pm/model';
import {isNodeEmpty} from 'src/utils/nodes';
import {getPlaceholderContent} from 'src/utils/placeholder';

import type {SerializerNodeToken} from '../../../../core';
import {isNodeEmpty} from '../../../../utils/nodes';
import {getPlaceholderContent} from '../../../../utils/placeholder';

import {CutAttr, CutNode} from './const';
import {CutAttr, CutNode, cutContentType, cutTitleType} from './const';

export function getSerializerTokens({
directiveSyntax,
Expand All @@ -16,27 +15,51 @@ export function getSerializerTokens({
};

return {
[CutNode.Cut]: (state, node) => {
state.renderContent(node);
state.write(isDirectiveCut(node) ? ':::' : '{% endcut %}');
state.closeBlock(node);
[CutNode.Cut]: (state, cutNode) => {
const {schema} = cutNode.type;
const titleNode =
cutNode.firstChild?.type === cutTitleType(schema) ? cutNode.firstChild : null;
const contentNode =
cutNode.lastChild?.type === cutContentType(schema) ? cutNode.lastChild : null;

if (isDirectiveCut(cutNode)) {
state.write(':::cut [');
if (titleNode) state.renderInline(titleNode);
state.write(']');
state.ensureNewLine();

if (contentNode) state.renderContent(contentNode);
state.ensureNewLine();
state.write(':::');

state.closeBlock();
return;
}

state.write('{% cut "');
if (titleNode) {
if (titleNode.nodeSize > 2) state.renderInline(titleNode);
else state.write(getPlaceholderContent(titleNode));
}
state.write('" %}\n');
state.write('\n');

if (contentNode) state.renderContent(contentNode);
state.write('{% endcut %}');
state.closeBlock(cutNode);
},

[CutNode.CutTitle]: (state, node, parent) => {
if (isDirectiveCut(parent)) {
state.write(':::cut [');
state.renderInline(node);
state.write(']');
state.ensureNewLine();
state.closeBlock();
return;
}

state.write('{% cut "');
if (node.nodeSize > 2) state.renderInline(node);
else state.write(getPlaceholderContent(node));
state.write('" %}\n');
state.write('\n');
state.ensureNewLine();
state.closeBlock();
},

Expand All @@ -46,8 +69,13 @@ export function getSerializerTokens({
return;
}

if (!isNodeEmpty(node)) state.renderInline(node);
else state.write(getPlaceholderContent(node) + '\n\n');
if (isNodeEmpty(node)) {
state.write(getPlaceholderContent(node));
state.write('\n');
state.write('\n');
} else {
state.renderContent(node);
}
},
};
}
52 changes: 32 additions & 20 deletions src/extensions/yfm/YfmNote/YfmNoteSpecs/serializer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,45 @@
import type {SerializerNodeToken} from '../../../../core';
import {isNodeEmpty} from '../../../../utils/nodes';
import {getPlaceholderContent} from '../../../../utils/placeholder';
import type {SerializerNodeToken} from '#core';
import {isNodeEmpty} from 'src/utils/nodes';
import {getPlaceholderContent} from 'src/utils/placeholder';

import {NoteAttrs, NoteNode} from './const';
import {noteContentType, noteTitleType} from './utils';

export const serializerTokens: Record<NoteNode, SerializerNodeToken> = {
[NoteNode.Note]: (state, node) => {
state.renderContent(node);
state.write('{% endnote %}');
state.closeBlock(node);
},
[NoteNode.Note]: (state, noteNode) => {
const {schema} = noteNode.type;
const titleNode =
noteNode.firstChild?.type === noteTitleType(schema) ? noteNode.firstChild : null;
const contentNode =
noteNode.lastChild?.type === noteContentType(schema) ? noteNode.lastChild : null;

[NoteNode.NoteTitle]: (state, node, parent) => {
state.write(`{% note ${parent.attrs[NoteAttrs.Type]} `);
if (node.nodeSize > 2) {
state.write('"');
state.renderInline(node);
state.write('"');
} else {
const placeholder = getPlaceholderContent(node);
if (placeholder) state.write(`"${placeholder}"`);
state.write(`{% note ${noteNode.attrs[NoteAttrs.Type]} "`);
if (titleNode) {
if (titleNode.nodeSize > 2) state.renderInline(titleNode);
else state.write(getPlaceholderContent(titleNode));
}
state.write(' %}\n');
state.write('" %}\n');
state.write('\n');

if (contentNode) state.renderContent(contentNode);
state.write('{% endnote %}');
state.closeBlock(noteNode);
},

[NoteNode.NoteTitle]: (state, node) => {
if (node.nodeSize > 2) state.renderInline(node);
else state.write(getPlaceholderContent(node));
state.ensureNewLine();
state.closeBlock();
},

[NoteNode.NoteContent]: (state, node) => {
if (!isNodeEmpty(node)) state.renderInline(node);
else state.write(getPlaceholderContent(node) + '\n\n');
if (isNodeEmpty(node)) {
state.write(getPlaceholderContent(node));
state.write('\n');
state.write('\n');
} else {
state.renderContent(node);
}
},
};
Loading