yaroslav
/
SequenceDiagram
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor improvements to link markdown handling [#54]

This commit is contained in:
David Evans 2018-05-07 01:00:17 +01:00
parent 3e4110193a
commit 4d4b22aa91
5 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/sequence-diagram-web.js
View File

@ -4163,6 +4163,10 @@
return pattern; return pattern;
} }
/* eslint-disable no-control-regex */ // Removing control characters is the aim
const CONTROL_CHARS$1 = /[\x00-\x08\x0E-\x1F]/g;
/* eslint-enable no-control-regex */
const STYLES = [ const STYLES = [
{ {
attrs: {'font-style': 'italic'}, attrs: {'font-style': 'italic'},
@ -4225,9 +4229,12 @@
begin: {matcher: /<highlight>/g, skip: 0}, begin: {matcher: /<highlight>/g, skip: 0},
end: {matcher: /<\/highlight>/g, skip: 0}, end: {matcher: /<\/highlight>/g, skip: 0},
}, { }, {
all: {matcher: /\[([^\]]+)\]\(([^)]+)\)/g, skip: 0}, all: {matcher: /\[([^\]]+)\]\(([^)]+?)(?: "([^"]+)")?\)/g, skip: 0},
attrs: (m) => ({'href': m[2], 'text-decoration': 'underline'}), attrs: (m) => ({
text: (m) => m[1], 'href': m[2].replace(CONTROL_CHARS$1, ''),
'text-decoration': 'underline',
}),
text: (m) => m[1].replace(CONTROL_CHARS$1, ''),
}, },
]; ];

2
lib/sequence-diagram-web.min.js vendored
View File

File diff suppressed because one or more lines are too long

13
lib/sequence-diagram.js
View File

@ -4163,6 +4163,10 @@
return pattern; return pattern;
} }
/* eslint-disable no-control-regex */ // Removing control characters is the aim
const CONTROL_CHARS$1 = /[\x00-\x08\x0E-\x1F]/g;
/* eslint-enable no-control-regex */
const STYLES = [ const STYLES = [
{ {
attrs: {'font-style': 'italic'}, attrs: {'font-style': 'italic'},
@ -4225,9 +4229,12 @@
begin: {matcher: /<highlight>/g, skip: 0}, begin: {matcher: /<highlight>/g, skip: 0},
end: {matcher: /<\/highlight>/g, skip: 0}, end: {matcher: /<\/highlight>/g, skip: 0},
}, { }, {
all: {matcher: /\[([^\]]+)\]\(([^)]+)\)/g, skip: 0}, all: {matcher: /\[([^\]]+)\]\(([^)]+?)(?: "([^"]+)")?\)/g, skip: 0},
attrs: (m) => ({'href': m[2], 'text-decoration': 'underline'}), attrs: (m) => ({
text: (m) => m[1], 'href': m[2].replace(CONTROL_CHARS$1, ''),
'text-decoration': 'underline',
}),
text: (m) => m[1].replace(CONTROL_CHARS$1, ''),
}, },
]; ];

13
scripts/sequence/parser/MarkdownParser.mjs
View File

@ -1,3 +1,7 @@
/* eslint-disable no-control-regex */ // Removing control characters is the aim
const CONTROL_CHARS = /[\x00-\x08\x0E-\x1F]/g;
/* eslint-enable no-control-regex */
const STYLES = [ const STYLES = [
{ {
attrs: {'font-style': 'italic'}, attrs: {'font-style': 'italic'},
@ -60,9 +64,12 @@ const STYLES = [
begin: {matcher: /<highlight>/g, skip: 0}, begin: {matcher: /<highlight>/g, skip: 0},
end: {matcher: /<\/highlight>/g, skip: 0}, end: {matcher: /<\/highlight>/g, skip: 0},
}, { }, {
all: {matcher: /\[([^\]]+)\]\(([^)]+)\)/g, skip: 0}, all: {matcher: /\[([^\]]+)\]\(([^)]+?)(?: "([^"]+)")?\)/g, skip: 0},
attrs: (m) => ({'href': m[2], 'text-decoration': 'underline'}), attrs: (m) => ({
text: (m) => m[1], 'href': m[2].replace(CONTROL_CHARS, ''),
'text-decoration': 'underline',
}),
text: (m) => m[1].replace(CONTROL_CHARS, ''),
}, },
]; ];

24
scripts/sequence/parser/MarkdownParser_spec.mjs
View File

@ -215,6 +215,30 @@ describe('Markdown Parser', () => {
]]); ]]);
}); });
it('silently ignores link titles', () => {
// SVG has no concept of titles, so these serve no purpose
const formatted = parser('a [b](c "d") e');
expect(formatted).toEqual([[
{attrs: null, text: 'a '},
{attrs: {'href': 'c', 'text-decoration': 'underline'}, text: 'b'},
{attrs: null, text: ' e'},
]]);
});
it('removes escapes from link text and destination', () => {
// SVG has no concept of titles, so these serve no purpose
const formatted = parser('a [b\u001Bc](d\u001Be) f');
expect(formatted).toEqual([[
{attrs: null, text: 'a '},
{attrs: {'href': 'de', 'text-decoration': 'underline'}, text: 'bc'},
{attrs: null, text: ' f'},
]]);
});
it('allows dots around monospace styling', () => { it('allows dots around monospace styling', () => {
const formatted = parser('a.`b`.c'); const formatted = parser('a.`b`.c');