securemark 0.291.1 → 0.292.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/design.md +13 -2
- package/dist/index.js +1093 -756
- package/markdown.d.ts +17 -17
- package/package.json +1 -1
- package/src/combinator/control/constraint/block.test.ts +8 -5
- package/src/combinator/control/constraint/block.ts +9 -9
- package/src/combinator/control/constraint/contract.ts +20 -28
- package/src/combinator/control/constraint/line.test.ts +9 -6
- package/src/combinator/control/constraint/line.ts +21 -22
- package/src/combinator/control/manipulation/convert.ts +29 -13
- package/src/combinator/control/manipulation/fence.ts +18 -15
- package/src/combinator/control/manipulation/indent.test.ts +17 -14
- package/src/combinator/control/manipulation/indent.ts +15 -8
- package/src/combinator/control/manipulation/match.ts +11 -10
- package/src/combinator/control/manipulation/recovery.ts +6 -2
- package/src/combinator/control/manipulation/scope.ts +37 -38
- package/src/combinator/control/manipulation/surround.ts +78 -60
- package/src/combinator/control/manipulation/trim.test.ts +12 -9
- package/src/combinator/control/monad/bind.ts +16 -16
- package/src/combinator/control/monad/fmap.ts +6 -6
- package/src/combinator/data/parser/context/delimiter.ts +8 -7
- package/src/combinator/data/parser/context.test.ts +19 -14
- package/src/combinator/data/parser/context.ts +20 -16
- package/src/combinator/data/parser/inits.ts +13 -14
- package/src/combinator/data/parser/sequence.test.ts +16 -15
- package/src/combinator/data/parser/sequence.ts +13 -14
- package/src/combinator/data/parser/some.test.ts +19 -18
- package/src/combinator/data/parser/some.ts +13 -15
- package/src/combinator/data/parser/subsequence.test.ts +22 -21
- package/src/combinator/data/parser/subsequence.ts +3 -3
- package/src/combinator/data/parser/tails.ts +3 -3
- package/src/combinator/data/parser/union.test.ts +16 -15
- package/src/combinator/data/parser/union.ts +2 -2
- package/src/combinator/data/parser.ts +66 -28
- package/src/debug.test.ts +3 -3
- package/src/parser/api/bind.ts +3 -3
- package/src/parser/api/header.ts +7 -6
- package/src/parser/api/normalize.ts +2 -2
- package/src/parser/api/parse.test.ts +14 -15
- package/src/parser/api/parse.ts +3 -3
- package/src/parser/autolink.test.ts +19 -17
- package/src/parser/block/blockquote.test.ts +86 -84
- package/src/parser/block/blockquote.ts +4 -2
- package/src/parser/block/codeblock.test.ts +58 -56
- package/src/parser/block/codeblock.ts +3 -3
- package/src/parser/block/dlist.test.ts +58 -56
- package/src/parser/block/extension/aside.test.ts +10 -8
- package/src/parser/block/extension/aside.ts +1 -1
- package/src/parser/block/extension/example.test.ts +20 -18
- package/src/parser/block/extension/example.ts +3 -3
- package/src/parser/block/extension/fig.test.ts +38 -36
- package/src/parser/block/extension/fig.ts +1 -1
- package/src/parser/block/extension/figbase.test.ts +17 -15
- package/src/parser/block/extension/figure.test.ts +64 -62
- package/src/parser/block/extension/figure.ts +3 -2
- package/src/parser/block/extension/message.test.ts +15 -13
- package/src/parser/block/extension/message.ts +3 -3
- package/src/parser/block/extension/placeholder.test.ts +3 -1
- package/src/parser/block/extension/table.test.ts +73 -71
- package/src/parser/block/extension/table.ts +5 -5
- package/src/parser/block/extension.test.ts +3 -1
- package/src/parser/block/heading.test.ts +65 -64
- package/src/parser/block/heading.ts +3 -3
- package/src/parser/block/ilist.test.ts +3 -1
- package/src/parser/block/ilist.ts +3 -3
- package/src/parser/block/mathblock.test.ts +33 -31
- package/src/parser/block/mathblock.ts +1 -1
- package/src/parser/block/mediablock.ts +2 -2
- package/src/parser/block/olist.test.ts +99 -97
- package/src/parser/block/olist.ts +2 -2
- package/src/parser/block/pagebreak.test.ts +17 -15
- package/src/parser/block/pagebreak.ts +1 -1
- package/src/parser/block/paragraph.test.ts +60 -57
- package/src/parser/block/reply/cite.test.ts +41 -39
- package/src/parser/block/reply/cite.ts +3 -3
- package/src/parser/block/reply/quote.test.ts +52 -50
- package/src/parser/block/reply.test.ts +21 -19
- package/src/parser/block/sidefence.test.ts +51 -49
- package/src/parser/block/table.test.ts +51 -50
- package/src/parser/block/table.ts +6 -6
- package/src/parser/block/ulist.test.ts +52 -50
- package/src/parser/block/ulist.ts +2 -2
- package/src/parser/block.ts +6 -5
- package/src/parser/context.ts +1 -0
- package/src/parser/header.test.ts +22 -21
- package/src/parser/header.ts +25 -13
- package/src/parser/inline/annotation.test.ts +44 -42
- package/src/parser/inline/annotation.ts +2 -2
- package/src/parser/inline/autolink/account.test.ts +32 -30
- package/src/parser/inline/autolink/account.ts +1 -1
- package/src/parser/inline/autolink/anchor.test.ts +23 -21
- package/src/parser/inline/autolink/anchor.ts +1 -1
- package/src/parser/inline/autolink/channel.test.ts +16 -14
- package/src/parser/inline/autolink/channel.ts +2 -2
- package/src/parser/inline/autolink/email.test.ts +38 -36
- package/src/parser/inline/autolink/email.ts +2 -2
- package/src/parser/inline/autolink/hashnum.test.ts +39 -37
- package/src/parser/inline/autolink/hashnum.ts +1 -1
- package/src/parser/inline/autolink/hashtag.test.ts +58 -56
- package/src/parser/inline/autolink/hashtag.ts +1 -1
- package/src/parser/inline/autolink/url.test.ts +76 -74
- package/src/parser/inline/autolink/url.ts +6 -6
- package/src/parser/inline/bracket.test.ts +69 -67
- package/src/parser/inline/bracket.ts +32 -32
- package/src/parser/inline/code.test.ts +32 -29
- package/src/parser/inline/code.ts +20 -13
- package/src/parser/inline/deletion.test.ts +29 -27
- package/src/parser/inline/deletion.ts +2 -2
- package/src/parser/inline/emphasis.test.ts +40 -36
- package/src/parser/inline/emphasis.ts +2 -2
- package/src/parser/inline/emstrong.test.ts +102 -96
- package/src/parser/inline/emstrong.ts +96 -36
- package/src/parser/inline/extension/index.test.ts +91 -89
- package/src/parser/inline/extension/index.ts +18 -30
- package/src/parser/inline/extension/indexee.ts +1 -1
- package/src/parser/inline/extension/indexer.test.ts +26 -24
- package/src/parser/inline/extension/indexer.ts +1 -1
- package/src/parser/inline/extension/label.test.ts +34 -32
- package/src/parser/inline/extension/placeholder.test.ts +44 -42
- package/src/parser/inline/extension/placeholder.ts +11 -8
- package/src/parser/inline/html.test.ts +108 -106
- package/src/parser/inline/html.ts +24 -23
- package/src/parser/inline/htmlentity.test.ts +39 -37
- package/src/parser/inline/htmlentity.ts +9 -3
- package/src/parser/inline/insertion.test.ts +29 -27
- package/src/parser/inline/insertion.ts +2 -2
- package/src/parser/inline/italic.test.ts +55 -53
- package/src/parser/inline/italic.ts +2 -2
- package/src/parser/inline/link.test.ts +187 -185
- package/src/parser/inline/link.ts +30 -12
- package/src/parser/inline/mark.test.ts +31 -29
- package/src/parser/inline/mark.ts +3 -3
- package/src/parser/inline/math.test.ts +133 -131
- package/src/parser/inline/math.ts +2 -2
- package/src/parser/inline/media.test.ts +93 -91
- package/src/parser/inline/media.ts +41 -17
- package/src/parser/inline/reference.test.ts +110 -108
- package/src/parser/inline/reference.ts +48 -39
- package/src/parser/inline/remark.test.ts +53 -51
- package/src/parser/inline/remark.ts +3 -3
- package/src/parser/inline/ruby.test.ts +46 -44
- package/src/parser/inline/ruby.ts +24 -27
- package/src/parser/inline/shortmedia.test.ts +11 -9
- package/src/parser/inline/strong.test.ts +37 -33
- package/src/parser/inline/strong.ts +6 -3
- package/src/parser/inline/template.test.ts +24 -22
- package/src/parser/inline/template.ts +20 -11
- package/src/parser/inline.test.ts +221 -220
- package/src/parser/inline.ts +13 -8
- package/src/parser/segment.ts +13 -8
- package/src/parser/source/escapable.test.ts +24 -22
- package/src/parser/source/escapable.ts +26 -41
- package/src/parser/source/line.test.ts +19 -17
- package/src/parser/source/line.ts +3 -3
- package/src/parser/source/str.ts +28 -11
- package/src/parser/source/text.test.ts +85 -83
- package/src/parser/source/text.ts +26 -54
- package/src/parser/source/unescapable.test.ts +24 -22
- package/src/parser/source/unescapable.ts +18 -33
- package/src/parser/source.ts +1 -1
- package/src/parser/util.ts +36 -33
- package/src/parser/visibility.ts +19 -15
- package/src/util/quote.ts +4 -2
|
@@ -1,113 +1,119 @@
|
|
|
1
1
|
import { emstrong } from './emstrong';
|
|
2
2
|
import { some } from '../../combinator';
|
|
3
|
+
import { input } from '../../combinator/data/parser';
|
|
3
4
|
import { inspect } from '../../debug.test';
|
|
4
5
|
|
|
5
6
|
describe('Unit: parser/inline/emstrong', () => {
|
|
6
7
|
describe('emstrong', () => {
|
|
7
|
-
const parser = (source: string) => some(emstrong)(
|
|
8
|
+
const parser = (source: string) => some(emstrong)(input(source, ctx));
|
|
9
|
+
const { context: ctx } = input('', {});
|
|
8
10
|
|
|
9
11
|
it('invalid', () => {
|
|
10
|
-
assert.deepStrictEqual(inspect(parser('***')), undefined);
|
|
11
|
-
assert.deepStrictEqual(inspect(parser('***a')), [['***', 'a'], '']);
|
|
12
|
-
assert.deepStrictEqual(inspect(parser('***a ***')), [['***', 'a', '
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('***a ***')), [['***', 'a', ' ', '
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('***a\n***')), [['***', 'a', '
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('***a\\ ***')), [['***', 'a', '
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('***a\\\n***')), [['***', 'a', '
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('*** ***')), undefined);
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('*** a***')), undefined);
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('*** a ***')), undefined);
|
|
20
|
-
assert.deepStrictEqual(inspect(parser('***\n***')), undefined);
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('***\na***')), undefined);
|
|
22
|
-
assert.deepStrictEqual(inspect(parser('***\\ a***')), undefined);
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('***\\\na***')), undefined);
|
|
24
|
-
assert.deepStrictEqual(inspect(parser('***<wbr>a***')), undefined);
|
|
25
|
-
assert.deepStrictEqual(inspect(parser(' ***a***')), undefined);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser('***'), ctx), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser('***a'), ctx), [['***', 'a'], '']);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser('***a ***'), ctx), [['***', 'a'], ' ***']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser('***a ***'), ctx), [['***', 'a', ' '], ' ***']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser('***a\n***'), ctx), [['***', 'a'], '\n***']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('***a\\ ***'), ctx), [['***', 'a'], '\\ ***']);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser('***a\\\n***'), ctx), [['***', 'a'], '\\\n***']);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser('*** ***'), ctx), undefined);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser('*** a***'), ctx), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser('*** a ***'), ctx), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser('***\n***'), ctx), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser('***\na***'), ctx), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser('***\\ a***'), ctx), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser('***\\\na***'), ctx), undefined);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser('***<wbr>a***'), ctx), undefined);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser(' ***a***'), ctx), undefined);
|
|
26
28
|
});
|
|
27
29
|
|
|
28
30
|
it('basic', () => {
|
|
29
|
-
assert.deepStrictEqual(inspect(parser('***a***')), [['<em><strong>a</strong></em>'], '']);
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('***ab***')), [['<em><strong>ab</strong></em>'], '']);
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('***a****')), [['<em><strong>a</strong></em>'], '*']);
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('***a\nb***')), [['<em><strong>a<br>b</strong></em>'], '']);
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('***a\\\nb***')), [['<em><strong>a<br>b</strong></em>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser('***a***'), ctx), [['<em><strong>a</strong></em>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser('***ab***'), ctx), [['<em><strong>ab</strong></em>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser('***a****'), ctx), [['<em><strong>a</strong></em>'], '*']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser('***a\nb***'), ctx), [['<em><strong>a<br>b</strong></em>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser('***a\\\nb***'), ctx), [['<em><strong>a<br>b</strong></em>'], '']);
|
|
34
36
|
});
|
|
35
37
|
|
|
36
38
|
it('nest', () => {
|
|
37
|
-
assert.deepStrictEqual(inspect(parser('***`a`***')), [['<em><strong><code data-src="`a`">a</code></strong></em>'], '']);
|
|
38
|
-
assert.deepStrictEqual(inspect(parser('***(*a*)***')), [['<em><strong><span class="paren">(<em>a</em>)</span></strong></em>'], '']);
|
|
39
|
-
assert.deepStrictEqual(inspect(parser('***(**a**)***')), [['<em><strong><span class="paren">(<strong>a</strong>)</span></strong></em>'], '']);
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('***(***a***)***')), [['<em><strong><span class="paren">(<em><strong>a</strong></em>)</span></strong></em>'], '']);
|
|
41
|
-
assert.deepStrictEqual(inspect(parser('***a*')), [['**', '<em>a</em>'], '']);
|
|
42
|
-
assert.deepStrictEqual(inspect(parser('***a*b')), [['**', '<em>a</em>', 'b'], '']);
|
|
43
|
-
assert.deepStrictEqual(inspect(parser('***a*b*')), [['**', '<em>a</em>', 'b', '*']
|
|
44
|
-
assert.deepStrictEqual(inspect(parser('***a*b*c')), [['**', '<em>a</em>', 'b
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('***a*b*c*')), [['**', '<em>a</em>', 'b', '<em>c</em>'], '']);
|
|
46
|
-
assert.deepStrictEqual(inspect(parser('***a*b*c**')), [['**', '<em>a</em>', 'b', '<em>c</em>', '*']
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('***a*b*c***')), [['<strong><em>a</em>b<em>c</em></strong>'], '']);
|
|
48
|
-
assert.deepStrictEqual(inspect(parser('***a*b**')), [['<strong><em>a</em>b</strong>'], '']);
|
|
49
|
-
assert.deepStrictEqual(inspect(parser('***a*b**c')), [['<strong><em>a</em>b</strong>'], 'c']);
|
|
50
|
-
assert.deepStrictEqual(inspect(parser('***a**')), [['*', '<strong>a</strong>'], '']);
|
|
51
|
-
assert.deepStrictEqual(inspect(parser('***a**b')), [['*', '<strong>a</strong>', 'b'], '']);
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('***a**b*')), [['<em><strong>a</strong>b</em>'], '']);
|
|
53
|
-
assert.deepStrictEqual(inspect(parser('***a**b**')), [['<em><strong>a</strong>b</em>'], '*']);
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('***a**b**c')), [['*', '<strong>a</strong>', 'b
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('***a**b**c*')), [['
|
|
56
|
-
assert.deepStrictEqual(inspect(parser('***a**b**c**')), [['*', '<strong>a</strong>', 'b', '<strong>c</strong>'], '']);
|
|
57
|
-
assert.deepStrictEqual(inspect(parser('***a**b**c***')), [['<em><strong>a</strong>b<strong>c</strong></em>'], '']);
|
|
58
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
59
|
-
assert.deepStrictEqual(inspect(parser('***a\\ *b****')), [['<em><strong>a <em>b</em></strong></em>'], '']);
|
|
60
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
61
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
62
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
63
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
64
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
65
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
66
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
67
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
68
|
-
assert.deepStrictEqual(inspect(parser('***a*b **')), [['**', '<em>a</em>', 'b'], ' **']);
|
|
69
|
-
assert.deepStrictEqual(inspect(parser('***a*
|
|
70
|
-
assert.deepStrictEqual(inspect(parser('***a**b*')), [['<em><strong>a</strong>b</em>'], '']);
|
|
71
|
-
assert.deepStrictEqual(inspect(parser('***a**b*c')), [['<em><strong>a</strong>b</em>'], 'c']);
|
|
72
|
-
assert.deepStrictEqual(inspect(parser('***a**b
|
|
73
|
-
assert.deepStrictEqual(inspect(parser('***a**b**c***')), [['<em><strong>a</strong>b<strong>c</strong></em>'], '']);
|
|
74
|
-
assert.deepStrictEqual(inspect(parser('***a**b**
|
|
75
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
76
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
77
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
78
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
79
|
-
assert.deepStrictEqual(inspect(parser('***a**b *')), [['*', '<strong>a</strong>', 'b'], ' *']);
|
|
80
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
81
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
82
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
83
|
-
assert.deepStrictEqual(inspect(parser('***a***')), [['<em><strong>a</strong></em>'], '']);
|
|
84
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
85
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
86
|
-
assert.deepStrictEqual(inspect(parser('***a
|
|
87
|
-
assert.deepStrictEqual(inspect(parser('***
|
|
88
|
-
assert.deepStrictEqual(inspect(parser('****a***')), [['*', '<em><strong>a</strong></em>'], '']);
|
|
89
|
-
assert.deepStrictEqual(inspect(parser('****a***b')), [['
|
|
90
|
-
assert.deepStrictEqual(inspect(parser('****a****')), [['<em><em><strong>a</strong></em></em>'], '']);
|
|
91
|
-
assert.deepStrictEqual(inspect(parser('****a****b')), [['<em><em><strong>a</strong></em></em>'], 'b']);
|
|
92
|
-
assert.deepStrictEqual(inspect(parser('*****a***')), [['**', '<em><strong>a</strong></em>'], '']);
|
|
93
|
-
assert.deepStrictEqual(inspect(parser('*****a***b')), [['**', '<em><strong>a</strong></em>'
|
|
94
|
-
assert.deepStrictEqual(inspect(parser('*****a
|
|
95
|
-
assert.deepStrictEqual(inspect(parser('*****a****
|
|
96
|
-
assert.deepStrictEqual(inspect(parser('*****a
|
|
97
|
-
assert.deepStrictEqual(inspect(parser('
|
|
98
|
-
assert.deepStrictEqual(inspect(parser('
|
|
99
|
-
assert.deepStrictEqual(inspect(parser('******a
|
|
100
|
-
assert.deepStrictEqual(inspect(parser('******a
|
|
101
|
-
assert.deepStrictEqual(inspect(parser('******a
|
|
102
|
-
assert.deepStrictEqual(inspect(parser('******a
|
|
103
|
-
assert.deepStrictEqual(inspect(parser('******a
|
|
104
|
-
assert.deepStrictEqual(inspect(parser('******a
|
|
105
|
-
assert.deepStrictEqual(inspect(parser('******a
|
|
106
|
-
assert.deepStrictEqual(inspect(parser('******a
|
|
107
|
-
assert.deepStrictEqual(inspect(parser('******a
|
|
108
|
-
assert.deepStrictEqual(inspect(parser('******a
|
|
109
|
-
assert.deepStrictEqual(inspect(parser('******a*b
|
|
110
|
-
assert.deepStrictEqual(inspect(parser('******a*b
|
|
39
|
+
assert.deepStrictEqual(inspect(parser('***`a`***'), ctx), [['<em><strong><code data-src="`a`">a</code></strong></em>'], '']);
|
|
40
|
+
assert.deepStrictEqual(inspect(parser('***(*a*)***'), ctx), [['<em><strong><span class="paren">(<em>a</em>)</span></strong></em>'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser('***(**a**)***'), ctx), [['<em><strong><span class="paren">(<strong>a</strong>)</span></strong></em>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser('***(***a***)***'), ctx), [['<em><strong><span class="paren">(<em><strong>a</strong></em>)</span></strong></em>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser('***a*'), ctx), [['**', '<em>a</em>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser('***a*b'), ctx), [['**', '<em>a</em>', 'b'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser('***a*b*'), ctx), [['**', '<em>a</em>', 'b'], '*']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser('***a*b*c'), ctx), [['**', '<em>a</em>', 'b*c'], '']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser('***a*b*c*'), ctx), [['**', '<em>a</em>', 'b', '<em>c</em>'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser('***a*b*c**'), ctx), [['**', '<em>a</em>', 'b', '<em>c</em>'], '*']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser('***a*b*c***'), ctx), [['<strong><em>a</em>b<em>c</em></strong>'], '']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser('***a*b**'), ctx), [['<strong><em>a</em>b</strong>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser('***a*b**c'), ctx), [['<strong><em>a</em>b</strong>'], 'c']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser('***a**'), ctx), [['*', '<strong>a</strong>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser('***a**b'), ctx), [['*', '<strong>a</strong>', 'b'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser('***a**b*'), ctx), [['<em><strong>a</strong>b</em>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser('***a**b**'), ctx), [['<em><strong>a</strong>b</em>'], '*']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser('***a**b**c'), ctx), [['*', '<strong>a</strong>', 'b**c'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser('***a**b**c*'), ctx), [['<em><strong>a</strong>b**c</em>'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser('***a**b**c**'), ctx), [['*', '<strong>a</strong>', 'b', '<strong>c</strong>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser('***a**b**c***'), ctx), [['<em><strong>a</strong>b<strong>c</strong></em>'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser('***a *b****'), ctx), [['<em><strong>a <em>b</em></strong></em>'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser('***a\\ *b****'), ctx), [['<em><strong>a <em>b</em></strong></em>'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser('***a	*b****'), ctx), [['<em><strong>a\t<em>b</em></strong></em>'], '']);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser('***a<wbr>*b****'), ctx), [['<em><strong>a<wbr><em>b</em></strong></em>'], '']);
|
|
64
|
+
assert.deepStrictEqual(inspect(parser('***a *b****'), ctx), [['<em><strong>a <em>b</em></strong></em>'], '']);
|
|
65
|
+
assert.deepStrictEqual(inspect(parser('***a* **b****'), ctx), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
|
|
66
|
+
assert.deepStrictEqual(inspect(parser('***a*\\ **b****'), ctx), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
|
|
67
|
+
assert.deepStrictEqual(inspect(parser('***a*	**b****'), ctx), [['<strong><em>a</em>\t<strong>b</strong></strong>'], '']);
|
|
68
|
+
assert.deepStrictEqual(inspect(parser('***a*<wbr>**b****'), ctx), [['<strong><em>a</em><wbr><strong>b</strong></strong>'], '']);
|
|
69
|
+
assert.deepStrictEqual(inspect(parser('***a*b **'), ctx), [['**', '<em>a</em>', 'b'], ' **']);
|
|
70
|
+
assert.deepStrictEqual(inspect(parser('***a*b\\ **'), ctx), [['**', '<em>a</em>', 'b'], '\\ **']);
|
|
71
|
+
assert.deepStrictEqual(inspect(parser('***a**b*'), ctx), [['<em><strong>a</strong>b</em>'], '']);
|
|
72
|
+
assert.deepStrictEqual(inspect(parser('***a**b*c'), ctx), [['<em><strong>a</strong>b</em>'], 'c']);
|
|
73
|
+
assert.deepStrictEqual(inspect(parser('***a**b*c**'), ctx), [['<em><strong>a</strong>b</em>'], 'c**']);
|
|
74
|
+
assert.deepStrictEqual(inspect(parser('***a**b**c***'), ctx), [['<em><strong>a</strong>b<strong>c</strong></em>'], '']);
|
|
75
|
+
assert.deepStrictEqual(inspect(parser('***a**b**c***d'), ctx), [['<em><strong>a</strong>b<strong>c</strong></em>'], 'd']);
|
|
76
|
+
assert.deepStrictEqual(inspect(parser('***a** *b**'), ctx), [['<em><strong>a</strong> <em>b</em></em>'], '']);
|
|
77
|
+
assert.deepStrictEqual(inspect(parser('***a**\\ *b**'), ctx), [['<em><strong>a</strong> <em>b</em></em>'], '']);
|
|
78
|
+
assert.deepStrictEqual(inspect(parser('***a**	*b**'), ctx), [['<em><strong>a</strong>\t<em>b</em></em>'], '']);
|
|
79
|
+
assert.deepStrictEqual(inspect(parser('***a**<wbr>*b**'), ctx), [['<em><strong>a</strong><wbr><em>b</em></em>'], '']);
|
|
80
|
+
assert.deepStrictEqual(inspect(parser('***a**b *'), ctx), [['*', '<strong>a</strong>', 'b'], ' *']);
|
|
81
|
+
assert.deepStrictEqual(inspect(parser('***a**b\\ *'), ctx), [['*', '<strong>a</strong>', 'b'], '\\ *']);
|
|
82
|
+
assert.deepStrictEqual(inspect(parser('***a*'), ctx), [['**', '<em>a</em>'], '']);
|
|
83
|
+
assert.deepStrictEqual(inspect(parser('***a**'), ctx), [['*', '<strong>a</strong>'], '']);
|
|
84
|
+
assert.deepStrictEqual(inspect(parser('***a***'), ctx), [['<em><strong>a</strong></em>'], '']);
|
|
85
|
+
assert.deepStrictEqual(inspect(parser('***a***b'), ctx), [['<em><strong>a</strong></em>'], 'b']);
|
|
86
|
+
assert.deepStrictEqual(inspect(parser('***a****'), ctx), [['<em><strong>a</strong></em>'], '*']);
|
|
87
|
+
assert.deepStrictEqual(inspect(parser('***a*****'), ctx), [['<em><strong>a</strong></em>'], '**']);
|
|
88
|
+
assert.deepStrictEqual(inspect(parser('***a******'), ctx), [['<em><strong>a</strong></em>'], '***']);
|
|
89
|
+
assert.deepStrictEqual(inspect(parser('****a***'), ctx), [['*', '<em><strong>a</strong></em>'], '']);
|
|
90
|
+
assert.deepStrictEqual(inspect(parser('****a***b'), ctx), [['*', '<em><strong>a</strong></em>', 'b'], '']);
|
|
91
|
+
assert.deepStrictEqual(inspect(parser('****a***b*'), ctx), [['<em><em><strong>a</strong></em>b</em>'], '']);
|
|
92
|
+
assert.deepStrictEqual(inspect(parser('****a****'), ctx), [['<em><em><strong>a</strong></em></em>'], '']);
|
|
93
|
+
assert.deepStrictEqual(inspect(parser('****a****b'), ctx), [['<em><em><strong>a</strong></em></em>'], 'b']);
|
|
94
|
+
assert.deepStrictEqual(inspect(parser('*****a***'), ctx), [['**', '<em><strong>a</strong></em>'], '']);
|
|
95
|
+
assert.deepStrictEqual(inspect(parser('*****a***b'), ctx), [['**', '<em><strong>a</strong></em>', 'b'], '']);
|
|
96
|
+
assert.deepStrictEqual(inspect(parser('*****a***b**'), ctx), [['<strong><em><strong>a</strong></em>b</strong>'], '']);
|
|
97
|
+
assert.deepStrictEqual(inspect(parser('*****a****'), ctx), [['*', '<em><em><strong>a</strong></em></em>'], '']);
|
|
98
|
+
assert.deepStrictEqual(inspect(parser('*****a****b'), ctx), [['*', '<em><em><strong>a</strong></em></em>', 'b'], '']);
|
|
99
|
+
assert.deepStrictEqual(inspect(parser('*****a****b*'), ctx), [['<em><em><em><strong>a</strong></em></em>b</em>'], '']);
|
|
100
|
+
assert.deepStrictEqual(inspect(parser('*****a*****'), ctx), [['<strong><em><strong>a</strong></em></strong>'], '']);
|
|
101
|
+
assert.deepStrictEqual(inspect(parser('******a***'), ctx), [['***', '<em><strong>a</strong></em>'], '']);
|
|
102
|
+
assert.deepStrictEqual(inspect(parser('******a***b'), ctx), [['***', '<em><strong>a</strong></em>', 'b'], '']);
|
|
103
|
+
assert.deepStrictEqual(inspect(parser('******a****'), ctx), [['**', '<em><em><strong>a</strong></em></em>'], '']);
|
|
104
|
+
assert.deepStrictEqual(inspect(parser('******a****b'), ctx), [['**', '<em><em><strong>a</strong></em></em>', 'b'], '']);
|
|
105
|
+
assert.deepStrictEqual(inspect(parser('******a****b**'), ctx), [['<strong><em><em><strong>a</strong></em></em>b</strong>'], '']);
|
|
106
|
+
assert.deepStrictEqual(inspect(parser('******a*****'), ctx), [['*', '<strong><em><strong>a</strong></em></strong>'], '']);
|
|
107
|
+
assert.deepStrictEqual(inspect(parser('******a*****b'), ctx), [['*', '<strong><em><strong>a</strong></em></strong>', 'b'], '']);
|
|
108
|
+
assert.deepStrictEqual(inspect(parser('******a*****b*'), ctx), [['<em><strong><em><strong>a</strong></em></strong>b</em>'], '']);
|
|
109
|
+
assert.deepStrictEqual(inspect(parser('******a******'), ctx), [['<em><strong><em><strong>a</strong></em></strong></em>'], '']);
|
|
110
|
+
assert.deepStrictEqual(inspect(parser('******a******b'), ctx), [['<em><strong><em><strong>a</strong></em></strong></em>'], 'b']);
|
|
111
|
+
assert.deepStrictEqual(inspect(parser('******a*b'), ctx), [['***', '**', '<em>a</em>', 'b'], '']);
|
|
112
|
+
assert.deepStrictEqual(inspect(parser('******a*b *'), ctx), [['***', '**', '<em>a</em>', 'b'], ' *']);
|
|
113
|
+
assert.deepStrictEqual(inspect(parser('******a*b **'), ctx), [['***', '**', '<em>a</em>', 'b'], ' **']);
|
|
114
|
+
assert.deepStrictEqual(inspect(parser('******a*b ***'), ctx), [['***', '**', '<em>a</em>', 'b'], ' ***']);
|
|
115
|
+
assert.deepStrictEqual(inspect(parser('******a*b ****'), ctx), [['***', '**', '<em>a</em>', 'b'], ' ****']);
|
|
116
|
+
assert.deepStrictEqual(inspect(parser('******a*b *****'), ctx), [['***', '**', '<em>a</em>', 'b'], ' *****']);
|
|
111
117
|
});
|
|
112
118
|
|
|
113
119
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EmStrongParser, EmphasisParser, StrongParser } from '../inline';
|
|
2
2
|
import { Recursion, Command } from '../context';
|
|
3
|
-
import { Result, IntermediateParser } from '../../combinator/data/parser';
|
|
3
|
+
import { Result, Node, Context, IntermediateParser } from '../../combinator/data/parser';
|
|
4
4
|
import { union, some, recursion, precedence, validate, surround, open, lazy, bind } from '../../combinator';
|
|
5
5
|
import { inline } from '../inline';
|
|
6
6
|
import { strong } from './strong';
|
|
@@ -8,14 +8,16 @@ import { emphasis } from './emphasis';
|
|
|
8
8
|
import { str } from '../source';
|
|
9
9
|
import { tightStart, blankWith } from '../visibility';
|
|
10
10
|
import { repeat } from '../util';
|
|
11
|
-
import { html, defrag } from 'typed-dom/dom';
|
|
12
11
|
import { unshift, push } from 'spica/array';
|
|
12
|
+
import { html, defrag } from 'typed-dom/dom';
|
|
13
13
|
|
|
14
14
|
const substrong: IntermediateParser<StrongParser> = lazy(() => some(union([
|
|
15
|
-
|
|
15
|
+
emphasis,
|
|
16
|
+
some(inline, blankWith('*')),
|
|
16
17
|
open(some(inline, '*'), union([
|
|
17
18
|
emstrong,
|
|
18
19
|
strong,
|
|
20
|
+
emphasis,
|
|
19
21
|
])),
|
|
20
22
|
])));
|
|
21
23
|
const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
|
|
@@ -37,62 +39,120 @@ export const emstrong: EmStrongParser = lazy(() => validate('***',
|
|
|
37
39
|
recursion(Recursion.inline,
|
|
38
40
|
tightStart(some(union([
|
|
39
41
|
some(inline, blankWith('*')),
|
|
40
|
-
open(some(inline, '*'),
|
|
42
|
+
open(some(inline, '*'), union([
|
|
43
|
+
emstrong,
|
|
44
|
+
strong,
|
|
45
|
+
emphasis,
|
|
46
|
+
])),
|
|
41
47
|
])))),
|
|
42
48
|
str(/^\*{1,3}/), false,
|
|
43
|
-
([, bs, cs],
|
|
49
|
+
([, bs, cs], context): Result<Node<EmStrongParser>, Context<EmStrongParser>> => {
|
|
44
50
|
assert(cs.length === 1);
|
|
51
|
+
const { buffer } = context;
|
|
45
52
|
switch (cs[0]) {
|
|
46
53
|
case '***':
|
|
47
|
-
return [bs
|
|
54
|
+
return [bs];
|
|
48
55
|
case '**':
|
|
49
56
|
return bind<EmphasisParser>(
|
|
50
57
|
subemphasis,
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
58
|
+
ds => {
|
|
59
|
+
const { source } = context;
|
|
60
|
+
if (source.startsWith('*', context.position)) {
|
|
61
|
+
context.position += 1;
|
|
62
|
+
return [[html('em', push(push(buffer!, [html('strong', defrag(bs))]), defrag(ds))), Command.Separator]];
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
return [prepend('*', push(push(push(buffer!, [html('strong', defrag(bs))]), defrag(ds)), [Command.Separator]))];
|
|
66
|
+
}
|
|
67
|
+
})
|
|
68
|
+
({ context }) ?? [prepend('*', push(push(buffer!, [html('strong', defrag(bs))]), [Command.Separator]))];
|
|
56
69
|
case '*':
|
|
57
70
|
return bind<StrongParser>(
|
|
58
71
|
substrong,
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
72
|
+
ds => {
|
|
73
|
+
const { source } = context;
|
|
74
|
+
if (source.startsWith('**', context.position)) {
|
|
75
|
+
context.position += 2;
|
|
76
|
+
return [[html('strong', push(push(buffer!, [html('em', defrag(bs))]), defrag(ds))), Command.Separator]];
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
return [prepend('**', push(push(push(buffer!, [html('em', defrag(bs))]), defrag(ds)), [Command.Separator]))];
|
|
80
|
+
}
|
|
81
|
+
})
|
|
82
|
+
({ context }) ?? [prepend('**', push(push(buffer!, [html('em', defrag(bs))]), [Command.Separator]))];
|
|
64
83
|
}
|
|
65
84
|
assert(false);
|
|
66
85
|
},
|
|
67
|
-
([
|
|
86
|
+
([, bs], { buffer }) => bs && [push(push(buffer!, bs), [Command.Cancel])]),
|
|
68
87
|
// 3以上の`*`に対してemの適用を保証する
|
|
69
88
|
nodes => [html('em', [html('strong', defrag(nodes))])],
|
|
70
|
-
(
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
if (state)
|
|
74
|
-
switch (
|
|
89
|
+
(nodes, context, prefix, postfix, state) => {
|
|
90
|
+
context.position += postfix;
|
|
91
|
+
assert(postfix < 3);
|
|
92
|
+
if (state) {
|
|
93
|
+
switch (postfix) {
|
|
94
|
+
case 0:
|
|
95
|
+
break;
|
|
75
96
|
case 1:
|
|
76
|
-
|
|
77
|
-
i -= 1;
|
|
97
|
+
nodes = [html('em', defrag(nodes))];
|
|
78
98
|
break;
|
|
79
99
|
case 2:
|
|
80
|
-
|
|
81
|
-
i -= 2;
|
|
100
|
+
nodes = [html('strong', defrag(nodes))];
|
|
82
101
|
break;
|
|
83
102
|
default:
|
|
84
|
-
|
|
85
|
-
|
|
103
|
+
assert(false);
|
|
104
|
+
}
|
|
105
|
+
prefix -= postfix;
|
|
106
|
+
postfix -= postfix;
|
|
107
|
+
switch (prefix) {
|
|
108
|
+
case 0:
|
|
109
|
+
break;
|
|
110
|
+
case 1:
|
|
111
|
+
nodes = bind<EmphasisParser>(
|
|
112
|
+
subemphasis,
|
|
113
|
+
ds => {
|
|
114
|
+
const { source } = context;
|
|
115
|
+
if (source.startsWith('*', context.position)) {
|
|
116
|
+
context.position += 1;
|
|
117
|
+
return [[html('em', push(nodes, defrag(ds)))]];
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
return [prepend('*', push(nodes, defrag(ds)))];
|
|
121
|
+
}
|
|
122
|
+
})
|
|
123
|
+
({ context })?.[0] ?? prepend('*', nodes);
|
|
124
|
+
prefix -= 1;
|
|
125
|
+
break;
|
|
126
|
+
case 2:
|
|
127
|
+
nodes = bind<StrongParser>(
|
|
128
|
+
substrong,
|
|
129
|
+
ds => {
|
|
130
|
+
const { source } = context;
|
|
131
|
+
if (source.startsWith('**', context.position)) {
|
|
132
|
+
context.position += 2;
|
|
133
|
+
return [[html('strong', push(nodes, defrag(ds)))]];
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
return [prepend('**', push(nodes, defrag(ds)))];
|
|
137
|
+
}
|
|
138
|
+
})
|
|
139
|
+
({ context })?.[0] ?? prepend('**', nodes);
|
|
140
|
+
prefix -= 2;
|
|
141
|
+
break;
|
|
86
142
|
}
|
|
87
143
|
}
|
|
88
144
|
if (prefix > postfix) {
|
|
89
|
-
nodes
|
|
145
|
+
nodes = push(['*'.repeat(prefix - postfix)], nodes);
|
|
90
146
|
}
|
|
91
|
-
|
|
92
|
-
nodes.push(...acc[i]);
|
|
93
|
-
}
|
|
94
|
-
if (postfix > 0) {
|
|
95
|
-
rest = rest.slice(postfix);
|
|
96
|
-
}
|
|
97
|
-
return [nodes, rest];
|
|
147
|
+
return [nodes];
|
|
98
148
|
}))));
|
|
149
|
+
|
|
150
|
+
function prepend<N>(prefix: string, nodes: N[]): N[] {
|
|
151
|
+
if (typeof nodes[0] === 'string') {
|
|
152
|
+
nodes[0] = prefix + nodes[0] as N;
|
|
153
|
+
}
|
|
154
|
+
else {
|
|
155
|
+
unshift([prefix], nodes);
|
|
156
|
+
}
|
|
157
|
+
return nodes;
|
|
158
|
+
}
|