securemark 0.295.0 → 0.295.2
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 +8 -0
- package/design.md +4 -3
- package/dist/index.js +529 -484
- package/markdown.d.ts +13 -28
- package/package.json +1 -1
- package/src/combinator/control/constraint/block.test.ts +6 -8
- package/src/combinator/control/constraint/contract.ts +7 -7
- package/src/combinator/control/constraint/line.test.ts +7 -9
- package/src/combinator/control/constraint/line.ts +0 -1
- package/src/combinator/control/manipulation/clear.ts +2 -2
- package/src/combinator/control/manipulation/convert.ts +3 -3
- package/src/combinator/control/manipulation/duplicate.ts +4 -4
- package/src/combinator/control/manipulation/fallback.ts +2 -2
- package/src/combinator/control/manipulation/fence.ts +3 -3
- package/src/combinator/control/manipulation/indent.test.ts +20 -22
- package/src/combinator/control/manipulation/indent.ts +2 -2
- package/src/combinator/control/manipulation/recovery.ts +3 -3
- package/src/combinator/control/manipulation/reverse.ts +2 -2
- package/src/combinator/control/manipulation/scope.ts +2 -4
- package/src/combinator/control/manipulation/surround.ts +66 -66
- package/src/combinator/control/monad/bind.ts +6 -6
- package/src/combinator/control/monad/fmap.ts +6 -6
- package/src/combinator/data/data.ts +2 -2
- package/src/combinator/data/{parser/context/delimiter.ts → delimiter.ts} +4 -4
- package/src/combinator/data/parser/context.test.ts +12 -11
- package/src/combinator/data/parser/context.ts +13 -14
- package/src/combinator/data/parser/inits.ts +5 -5
- package/src/combinator/data/parser/sequence.test.ts +12 -13
- package/src/combinator/data/parser/sequence.ts +5 -5
- package/src/combinator/data/parser/some.test.ts +15 -16
- package/src/combinator/data/parser/some.ts +5 -6
- package/src/combinator/data/parser/subsequence.test.ts +16 -17
- 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 +12 -13
- package/src/combinator/data/parser/union.ts +3 -3
- package/src/combinator/data/parser.ts +55 -32
- package/src/debug.test.ts +5 -3
- package/src/parser/api/bind.ts +8 -6
- package/src/parser/api/header.ts +4 -4
- package/src/parser/api/normalize.ts +2 -1
- package/src/parser/api/parse.test.ts +7 -6
- package/src/parser/api/parse.ts +9 -8
- package/src/parser/autolink.test.ts +18 -18
- package/src/parser/block/blockquote.test.ts +79 -79
- package/src/parser/block/blockquote.ts +5 -5
- package/src/parser/block/codeblock.test.ts +57 -57
- package/src/parser/block/codeblock.ts +3 -3
- package/src/parser/block/dlist.test.ts +57 -57
- package/src/parser/block/dlist.ts +6 -6
- package/src/parser/block/extension/aside.test.ts +9 -9
- package/src/parser/block/extension/aside.ts +5 -5
- package/src/parser/block/extension/example.test.ts +19 -19
- package/src/parser/block/extension/example.ts +6 -6
- package/src/parser/block/extension/fig.test.ts +36 -36
- package/src/parser/block/extension/figbase.test.ts +16 -16
- package/src/parser/block/extension/figbase.ts +2 -2
- package/src/parser/block/extension/figure.test.ts +63 -63
- package/src/parser/block/extension/figure.ts +3 -3
- package/src/parser/block/extension/message.test.ts +14 -14
- package/src/parser/block/extension/message.ts +5 -5
- package/src/parser/block/extension/placeholder.test.ts +13 -13
- package/src/parser/block/extension/placeholder.ts +2 -2
- package/src/parser/block/extension/table.test.ts +76 -76
- package/src/parser/block/extension/table.ts +14 -14
- package/src/parser/block/extension.test.ts +24 -24
- package/src/parser/block/heading.test.ts +59 -59
- package/src/parser/block/heading.ts +7 -7
- package/src/parser/block/ilist.test.ts +8 -12
- package/src/parser/block/ilist.ts +6 -6
- package/src/parser/block/mathblock.test.ts +32 -32
- package/src/parser/block/mathblock.ts +3 -3
- package/src/parser/block/mediablock.ts +3 -3
- package/src/parser/block/olist.test.ts +103 -103
- package/src/parser/block/olist.ts +5 -5
- package/src/parser/block/pagebreak.test.ts +16 -16
- package/src/parser/block/pagebreak.ts +2 -2
- package/src/parser/block/paragraph.test.ts +58 -58
- package/src/parser/block/paragraph.ts +2 -2
- package/src/parser/block/reply/cite.test.ts +40 -40
- package/src/parser/block/reply/cite.ts +6 -6
- package/src/parser/block/reply/quote.test.ts +51 -51
- package/src/parser/block/reply/quote.ts +3 -3
- package/src/parser/block/reply.test.ts +20 -20
- package/src/parser/block/reply.ts +3 -3
- package/src/parser/block/sidefence.test.ts +48 -48
- package/src/parser/block/sidefence.ts +4 -4
- package/src/parser/block/table.test.ts +50 -50
- package/src/parser/block/table.ts +12 -12
- package/src/parser/block/ulist.test.ts +53 -53
- package/src/parser/block/ulist.ts +6 -6
- package/src/parser/block.ts +6 -4
- package/src/parser/context.ts +39 -0
- package/src/parser/header.test.ts +23 -23
- package/src/parser/header.ts +5 -5
- package/src/parser/inline/annotation.test.ts +43 -43
- package/src/parser/inline/annotation.ts +15 -5
- package/src/parser/inline/autolink/account.test.ts +33 -33
- package/src/parser/inline/autolink/account.ts +9 -9
- package/src/parser/inline/autolink/anchor.test.ts +22 -22
- package/src/parser/inline/autolink/anchor.ts +4 -4
- package/src/parser/inline/autolink/channel.test.ts +15 -15
- package/src/parser/inline/autolink/email.test.ts +37 -37
- package/src/parser/inline/autolink/email.ts +2 -2
- package/src/parser/inline/autolink/hashnum.test.ts +33 -33
- package/src/parser/inline/autolink/hashnum.ts +6 -5
- package/src/parser/inline/autolink/hashtag.test.ts +60 -60
- package/src/parser/inline/autolink/hashtag.ts +4 -4
- package/src/parser/inline/autolink/url.test.ts +75 -75
- package/src/parser/inline/autolink/url.ts +4 -4
- package/src/parser/inline/bracket.test.ts +70 -70
- package/src/parser/inline/bracket.ts +35 -32
- package/src/parser/inline/code.test.ts +31 -31
- package/src/parser/inline/code.ts +4 -4
- package/src/parser/inline/deletion.test.ts +28 -28
- package/src/parser/inline/deletion.ts +4 -4
- package/src/parser/inline/emphasis.test.ts +40 -40
- package/src/parser/inline/emphasis.ts +3 -3
- package/src/parser/inline/emstrong.test.ts +101 -101
- package/src/parser/inline/emstrong.ts +23 -23
- package/src/parser/inline/extension/index.test.ts +92 -92
- package/src/parser/inline/extension/index.ts +5 -5
- package/src/parser/inline/extension/indexee.ts +5 -5
- package/src/parser/inline/extension/indexer.test.ts +24 -24
- package/src/parser/inline/extension/indexer.ts +2 -2
- package/src/parser/inline/extension/label.test.ts +33 -33
- package/src/parser/inline/extension/label.ts +2 -2
- package/src/parser/inline/extension/placeholder.test.ts +43 -43
- package/src/parser/inline/extension/placeholder.ts +4 -4
- package/src/parser/inline/html.test.ts +108 -108
- package/src/parser/inline/html.ts +10 -10
- package/src/parser/inline/htmlentity.test.ts +38 -38
- package/src/parser/inline/htmlentity.ts +5 -5
- package/src/parser/inline/insertion.test.ts +28 -28
- package/src/parser/inline/insertion.ts +4 -4
- package/src/parser/inline/italic.test.ts +55 -55
- package/src/parser/inline/italic.ts +4 -4
- package/src/parser/inline/link.test.ts +186 -187
- package/src/parser/inline/link.ts +16 -17
- package/src/parser/inline/mark.test.ts +31 -31
- package/src/parser/inline/mark.ts +5 -5
- package/src/parser/inline/math.test.ts +132 -132
- package/src/parser/inline/math.ts +2 -2
- package/src/parser/inline/media.test.ts +91 -91
- package/src/parser/inline/media.ts +15 -15
- package/src/parser/inline/reference.test.ts +109 -109
- package/src/parser/inline/reference.ts +16 -55
- package/src/parser/inline/remark.test.ts +50 -50
- package/src/parser/inline/remark.ts +5 -5
- package/src/parser/inline/ruby.test.ts +45 -45
- package/src/parser/inline/ruby.ts +17 -17
- package/src/parser/inline/shortmedia.test.ts +10 -10
- package/src/parser/inline/strong.test.ts +37 -37
- package/src/parser/inline/strong.ts +3 -3
- package/src/parser/inline/template.test.ts +23 -23
- package/src/parser/inline/template.ts +5 -5
- package/src/parser/inline.test.ts +224 -223
- package/src/parser/segment.ts +2 -2
- package/src/parser/source/escapable.test.ts +24 -24
- package/src/parser/source/escapable.ts +8 -8
- package/src/parser/source/line.test.ts +18 -18
- package/src/parser/source/str.ts +2 -2
- package/src/parser/source/text.test.ts +85 -85
- package/src/parser/source/text.ts +5 -5
- package/src/parser/source/unescapable.test.ts +24 -24
- package/src/parser/source/unescapable.ts +5 -5
- package/src/parser/util.ts +10 -11
- package/src/parser/visibility.ts +8 -9
- package/src/util/quote.ts +2 -1
|
@@ -1,58 +1,58 @@
|
|
|
1
1
|
import { emphasis } from './emphasis';
|
|
2
2
|
import { some } from '../../combinator';
|
|
3
3
|
import { input } from '../../combinator/data/parser';
|
|
4
|
+
import { Context } from '../context';
|
|
4
5
|
import { inspect } from '../../debug.test';
|
|
5
6
|
|
|
6
7
|
describe('Unit: parser/inline/emphasis', () => {
|
|
7
8
|
describe('emphasis', () => {
|
|
8
|
-
const parser =
|
|
9
|
-
const { context: ctx } = input('', {});
|
|
9
|
+
const parser = some(emphasis);
|
|
10
10
|
|
|
11
11
|
it('invalid', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser('*'
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('*a'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('*a *'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('*a *'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('*a\n*'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('*a\\ *'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('*a\\\n*'
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('*a**b'
|
|
20
|
-
assert.deepStrictEqual(inspect(parser('* *'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('* a*'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser('* a *'
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('*\n*'
|
|
24
|
-
assert.deepStrictEqual(inspect(parser('*\na*'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser('*\\ a*'
|
|
26
|
-
assert.deepStrictEqual(inspect(parser('*\\\na*'
|
|
27
|
-
assert.deepStrictEqual(inspect(parser('*<wbr>a*'
|
|
28
|
-
assert.deepStrictEqual(inspect(parser('**a**'
|
|
29
|
-
assert.deepStrictEqual(inspect(parser('***a***'
|
|
30
|
-
assert.deepStrictEqual(inspect(parser(' *a*'
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('*', new Context())), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('*a', new Context())), [['*', 'a'], '']);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('*a *', new Context())), [['*', 'a', ' ', '*'], '']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('*a *', new Context())), [['*', 'a', ' ', '*'], '']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('*a\n*', new Context())), [['*', 'a', '<br>', '*'], '']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('*a\\ *', new Context())), [['*', 'a', ' ', '*'], '']);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input('*a\\\n*', new Context())), [['*', 'a', '<br>', '*'], '']);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('*a**b', new Context())), [['*', 'a', '**', 'b'], '']);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser, input('* *', new Context())), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('* a*', new Context())), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('* a *', new Context())), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('*\n*', new Context())), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('*\na*', new Context())), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('*\\ a*', new Context())), undefined);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input('*\\\na*', new Context())), undefined);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser, input('*<wbr>a*', new Context())), undefined);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser, input('**a**', new Context())), undefined);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser, input('***a***', new Context())), undefined);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser, input(' *a*', new Context())), undefined);
|
|
31
31
|
});
|
|
32
32
|
|
|
33
33
|
it('basic', () => {
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('*a*'
|
|
35
|
-
assert.deepStrictEqual(inspect(parser('*ab*'
|
|
36
|
-
assert.deepStrictEqual(inspect(parser('*a**'
|
|
37
|
-
assert.deepStrictEqual(inspect(parser('*a\nb*'
|
|
38
|
-
assert.deepStrictEqual(inspect(parser('*a\\\nb*'
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('*a*', new Context())), [['<em>a</em>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('*ab*', new Context())), [['<em>ab</em>'], '']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser, input('*a**', new Context())), [['<em>a</em>'], '*']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser, input('*a\nb*', new Context())), [['<em>a<br>b</em>'], '']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser, input('*a\\\nb*', new Context())), [['<em>a<br>b</em>'], '']);
|
|
39
39
|
});
|
|
40
40
|
|
|
41
41
|
it('nest', () => {
|
|
42
|
-
assert.deepStrictEqual(inspect(parser('*a *b**'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser('*- *b**'
|
|
44
|
-
assert.deepStrictEqual(inspect(parser('*a **b***'
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('*a\\ *b**'
|
|
46
|
-
assert.deepStrictEqual(inspect(parser('*a	*b**'
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('*a<wbr>*b**'
|
|
48
|
-
assert.deepStrictEqual(inspect(parser('*a**b*'
|
|
49
|
-
assert.deepStrictEqual(inspect(parser('*a**b**'
|
|
50
|
-
assert.deepStrictEqual(inspect(parser('*a**b**c'
|
|
51
|
-
assert.deepStrictEqual(inspect(parser('*a**b**c*'
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('*a**b**c*d'
|
|
53
|
-
assert.deepStrictEqual(inspect(parser('*`a`*'
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('*(*a*)*'
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('*(**a**)*'
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('*a *b**', new Context())), [['<em>a <em>b</em></em>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser, input('*- *b**', new Context())), [['<em>- <em>b</em></em>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser, input('*a **b***', new Context())), [['<em>a <strong>b</strong></em>'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser, input('*a\\ *b**', new Context())), [['<em>a <em>b</em></em>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser, input('*a	*b**', new Context())), [['<em>a\t<em>b</em></em>'], '']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser, input('*a<wbr>*b**', new Context())), [['<em>a<wbr><em>b</em></em>'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser, input('*a**b*', new Context())), [['<em>a**b</em>'], '']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser, input('*a**b**', new Context())), [[ '*', 'a', '<strong>b</strong>'], '']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser, input('*a**b**c', new Context())), [['*', 'a', '<strong>b</strong>', 'c'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser, input('*a**b**c*', new Context())), [['<em>a<strong>b</strong>c</em>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser, input('*a**b**c*d', new Context())), [['<em>a<strong>b</strong>c</em>'], 'd']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser, input('*`a`*', new Context())), [['<em><code data-src="`a`">a</code></em>'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser, input('*(*a*)*', new Context())), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser, input('*(**a**)*', new Context())), [['<em><span class="paren">(<strong>a</strong>)</span></em>'], '']);
|
|
56
56
|
});
|
|
57
57
|
|
|
58
58
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EmphasisParser } from '../inline';
|
|
2
2
|
import { Recursion } from '../context';
|
|
3
|
-
import { List,
|
|
3
|
+
import { List, Node } from '../../combinator/data/parser';
|
|
4
4
|
import { union, some, recursion, precedence, surround, open, lazy } from '../../combinator';
|
|
5
5
|
import { inline } from '../inline';
|
|
6
6
|
import { strong } from './strong';
|
|
@@ -19,5 +19,5 @@ export const emphasis: EmphasisParser = lazy(() => surround(
|
|
|
19
19
|
]))))),
|
|
20
20
|
str('*'),
|
|
21
21
|
false, [],
|
|
22
|
-
([, bs]) => new List([new
|
|
23
|
-
([as, bs]) => bs && as.import(bs as List<
|
|
22
|
+
([, bs]) => new List([new Node(html('em', defrag(unwrap(bs))))]),
|
|
23
|
+
([as, bs]) => bs && as.import(bs as List<Node<string>>)));
|
|
@@ -1,119 +1,119 @@
|
|
|
1
1
|
import { emstrong } from './emstrong';
|
|
2
2
|
import { some } from '../../combinator';
|
|
3
3
|
import { input } from '../../combinator/data/parser';
|
|
4
|
+
import { Context } from '../context';
|
|
4
5
|
import { inspect } from '../../debug.test';
|
|
5
6
|
|
|
6
7
|
describe('Unit: parser/inline/emstrong', () => {
|
|
7
8
|
describe('emstrong', () => {
|
|
8
|
-
const parser =
|
|
9
|
-
const { context: ctx } = input('', {});
|
|
9
|
+
const parser = some(emstrong);
|
|
10
10
|
|
|
11
11
|
it('invalid', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser('***'
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('***a'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('***a ***'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('***a ***'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('***a\n***'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('***a\\ ***'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('***a\\\n***'
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('*** ***'
|
|
20
|
-
assert.deepStrictEqual(inspect(parser('*** a***'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('*** a ***'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser('***\n***'
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('***\na***'
|
|
24
|
-
assert.deepStrictEqual(inspect(parser('***\\ a***'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser('***\\\na***'
|
|
26
|
-
assert.deepStrictEqual(inspect(parser('***<wbr>a***'
|
|
27
|
-
assert.deepStrictEqual(inspect(parser(' ***a***'
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('***', new Context())), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('***a', new Context())), [['***a'], '']);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('***a ***', new Context())), [['***a', ' ', '***'], '']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('***a ***', new Context())), [['***a', ' ', '***'], '']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('***a\n***', new Context())), [['***a', '<br>', '***'], '']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('***a\\ ***', new Context())), [['***a', ' ', '***'], '']);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input('***a\\\n***', new Context())), [['***a', '<br>', '***'], '']);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('*** ***', new Context())), undefined);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser, input('*** a***', new Context())), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('*** a ***', new Context())), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('***\n***', new Context())), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('***\na***', new Context())), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('***\\ a***', new Context())), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('***\\\na***', new Context())), undefined);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input('***<wbr>a***', new Context())), undefined);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser, input(' ***a***', new Context())), undefined);
|
|
28
28
|
});
|
|
29
29
|
|
|
30
30
|
it('basic', () => {
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('***a***'
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('***ab***'
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('***a****'
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('***a\nb***'
|
|
35
|
-
assert.deepStrictEqual(inspect(parser('***a\\\nb***'
|
|
31
|
+
assert.deepStrictEqual(inspect(parser, input('***a***', new Context())), [['<em><strong>a</strong></em>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser, input('***ab***', new Context())), [['<em><strong>ab</strong></em>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser, input('***a****', new Context())), [['<em><strong>a</strong></em>'], '*']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('***a\nb***', new Context())), [['<em><strong>a<br>b</strong></em>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('***a\\\nb***', new Context())), [['<em><strong>a<br>b</strong></em>'], '']);
|
|
36
36
|
});
|
|
37
37
|
|
|
38
38
|
it('nest', () => {
|
|
39
|
-
assert.deepStrictEqual(inspect(parser('***`a`***'
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('***(*a*)***'
|
|
41
|
-
assert.deepStrictEqual(inspect(parser('***(**a**)***'
|
|
42
|
-
assert.deepStrictEqual(inspect(parser('***(***a***)***'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser('***a*'
|
|
44
|
-
assert.deepStrictEqual(inspect(parser('***a*b'
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('***a*b*'
|
|
46
|
-
assert.deepStrictEqual(inspect(parser('***a*b*c'
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('***a*b*c*'
|
|
48
|
-
assert.deepStrictEqual(inspect(parser('***a*b*c**'
|
|
49
|
-
assert.deepStrictEqual(inspect(parser('***a*b*c***'
|
|
50
|
-
assert.deepStrictEqual(inspect(parser('***a*b**'
|
|
51
|
-
assert.deepStrictEqual(inspect(parser('***a*b**c'
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('***a**'
|
|
53
|
-
assert.deepStrictEqual(inspect(parser('***a**b'
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('***a**b*'
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('***a**b**'
|
|
56
|
-
assert.deepStrictEqual(inspect(parser('***a**b**c'
|
|
57
|
-
assert.deepStrictEqual(inspect(parser('***a**b**c*'
|
|
58
|
-
assert.deepStrictEqual(inspect(parser('***a**b**c**'
|
|
59
|
-
assert.deepStrictEqual(inspect(parser('***a**b**c***'
|
|
60
|
-
assert.deepStrictEqual(inspect(parser('***a *b****'
|
|
61
|
-
assert.deepStrictEqual(inspect(parser('***a\\ *b****'
|
|
62
|
-
assert.deepStrictEqual(inspect(parser('***a	*b****'
|
|
63
|
-
assert.deepStrictEqual(inspect(parser('***a<wbr>*b****'
|
|
64
|
-
assert.deepStrictEqual(inspect(parser('***a *b****'
|
|
65
|
-
assert.deepStrictEqual(inspect(parser('***a* **b****'
|
|
66
|
-
assert.deepStrictEqual(inspect(parser('***a*\\ **b****'
|
|
67
|
-
assert.deepStrictEqual(inspect(parser('***a*	**b****'
|
|
68
|
-
assert.deepStrictEqual(inspect(parser('***a*<wbr>**b****'
|
|
69
|
-
assert.deepStrictEqual(inspect(parser('***a*b **'
|
|
70
|
-
assert.deepStrictEqual(inspect(parser('***a*b\\ **'
|
|
71
|
-
assert.deepStrictEqual(inspect(parser('***a**b*'
|
|
72
|
-
assert.deepStrictEqual(inspect(parser('***a**b*c'
|
|
73
|
-
assert.deepStrictEqual(inspect(parser('***a**b*c**'
|
|
74
|
-
assert.deepStrictEqual(inspect(parser('***a**b**c***'
|
|
75
|
-
assert.deepStrictEqual(inspect(parser('***a**b**c***d'
|
|
76
|
-
assert.deepStrictEqual(inspect(parser('***a** *b**'
|
|
77
|
-
assert.deepStrictEqual(inspect(parser('***a**\\ *b**'
|
|
78
|
-
assert.deepStrictEqual(inspect(parser('***a**	*b**'
|
|
79
|
-
assert.deepStrictEqual(inspect(parser('***a**<wbr>*b**'
|
|
80
|
-
assert.deepStrictEqual(inspect(parser('***a**b *'
|
|
81
|
-
assert.deepStrictEqual(inspect(parser('***a**b\\ *'
|
|
82
|
-
assert.deepStrictEqual(inspect(parser('***a*'
|
|
83
|
-
assert.deepStrictEqual(inspect(parser('***a**'
|
|
84
|
-
assert.deepStrictEqual(inspect(parser('***a***'
|
|
85
|
-
assert.deepStrictEqual(inspect(parser('***a***b'
|
|
86
|
-
assert.deepStrictEqual(inspect(parser('***a****'
|
|
87
|
-
assert.deepStrictEqual(inspect(parser('***a*****'
|
|
88
|
-
assert.deepStrictEqual(inspect(parser('***a******'
|
|
89
|
-
assert.deepStrictEqual(inspect(parser('****a***'
|
|
90
|
-
assert.deepStrictEqual(inspect(parser('****a***b'
|
|
91
|
-
assert.deepStrictEqual(inspect(parser('****a***b*'
|
|
92
|
-
assert.deepStrictEqual(inspect(parser('****a****'
|
|
93
|
-
assert.deepStrictEqual(inspect(parser('****a****b'
|
|
94
|
-
assert.deepStrictEqual(inspect(parser('*****a***'
|
|
95
|
-
assert.deepStrictEqual(inspect(parser('*****a***b'
|
|
96
|
-
assert.deepStrictEqual(inspect(parser('*****a***b**'
|
|
97
|
-
assert.deepStrictEqual(inspect(parser('*****a****'
|
|
98
|
-
assert.deepStrictEqual(inspect(parser('*****a****b'
|
|
99
|
-
assert.deepStrictEqual(inspect(parser('*****a****b*'
|
|
100
|
-
assert.deepStrictEqual(inspect(parser('*****a*****'
|
|
101
|
-
assert.deepStrictEqual(inspect(parser('******a***'
|
|
102
|
-
assert.deepStrictEqual(inspect(parser('******a***b'
|
|
103
|
-
assert.deepStrictEqual(inspect(parser('******a****'
|
|
104
|
-
assert.deepStrictEqual(inspect(parser('******a****b'
|
|
105
|
-
assert.deepStrictEqual(inspect(parser('******a****b**'
|
|
106
|
-
assert.deepStrictEqual(inspect(parser('******a*****'
|
|
107
|
-
assert.deepStrictEqual(inspect(parser('******a*****b'
|
|
108
|
-
assert.deepStrictEqual(inspect(parser('******a*****b*'
|
|
109
|
-
assert.deepStrictEqual(inspect(parser('******a******'
|
|
110
|
-
assert.deepStrictEqual(inspect(parser('******a******b'
|
|
111
|
-
assert.deepStrictEqual(inspect(parser('******a*b'
|
|
112
|
-
assert.deepStrictEqual(inspect(parser('******a*b *'
|
|
113
|
-
assert.deepStrictEqual(inspect(parser('******a*b **'
|
|
114
|
-
assert.deepStrictEqual(inspect(parser('******a*b ***'
|
|
115
|
-
assert.deepStrictEqual(inspect(parser('******a*b ****'
|
|
116
|
-
assert.deepStrictEqual(inspect(parser('******a*b *****'
|
|
39
|
+
assert.deepStrictEqual(inspect(parser, input('***`a`***', new Context())), [['<em><strong><code data-src="`a`">a</code></strong></em>'], '']);
|
|
40
|
+
assert.deepStrictEqual(inspect(parser, input('***(*a*)***', new Context())), [['<em><strong><span class="paren">(<em>a</em>)</span></strong></em>'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser, input('***(**a**)***', new Context())), [['<em><strong><span class="paren">(<strong>a</strong>)</span></strong></em>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('***(***a***)***', new Context())), [['<em><strong><span class="paren">(<em><strong>a</strong></em>)</span></strong></em>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser, input('***a*', new Context())), [['**', '<em>a</em>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser, input('***a*b', new Context())), [['**', '<em>a</em>', 'b'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser, input('***a*b*', new Context())), [['**', '<em>a</em>', 'b'], '*']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser, input('***a*b*c', new Context())), [['**', '<em>a</em>', 'b', '*', 'c'], '']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser, input('***a*b*c*', new Context())), [['**', '<em>a</em>', 'b', '<em>c</em>'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser, input('***a*b*c**', new Context())), [['**', '<em>a</em>', 'b', '<em>c</em>'], '*']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser, input('***a*b*c***', new Context())), [['<strong><em>a</em>b<em>c</em></strong>'], '']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser, input('***a*b**', new Context())), [['<strong><em>a</em>b</strong>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser, input('***a*b**c', new Context())), [['<strong><em>a</em>b</strong>'], 'c']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser, input('***a**', new Context())), [['*', '<strong>a</strong>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b', new Context())), [['*', '<strong>a</strong>', 'b'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b*', new Context())), [['<em><strong>a</strong>b</em>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b**', new Context())), [['<em><strong>a</strong>b</em>'], '*']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b**c', new Context())), [['*', '<strong>a</strong>', 'b', '**', 'c'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b**c*', new Context())), [['<em><strong>a</strong>b**c</em>'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b**c**', new Context())), [['*', '<strong>a</strong>', 'b', '<strong>c</strong>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b**c***', new Context())), [['<em><strong>a</strong>b<strong>c</strong></em>'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser, input('***a *b****', new Context())), [['<em><strong>a <em>b</em></strong></em>'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser, input('***a\\ *b****', new Context())), [['<em><strong>a <em>b</em></strong></em>'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser, input('***a	*b****', new Context())), [['<em><strong>a\t<em>b</em></strong></em>'], '']);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser, input('***a<wbr>*b****', new Context())), [['<em><strong>a<wbr><em>b</em></strong></em>'], '']);
|
|
64
|
+
assert.deepStrictEqual(inspect(parser, input('***a *b****', new Context())), [['<em><strong>a <em>b</em></strong></em>'], '']);
|
|
65
|
+
assert.deepStrictEqual(inspect(parser, input('***a* **b****', new Context())), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
|
|
66
|
+
assert.deepStrictEqual(inspect(parser, input('***a*\\ **b****', new Context())), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
|
|
67
|
+
assert.deepStrictEqual(inspect(parser, input('***a*	**b****', new Context())), [['<strong><em>a</em>\t<strong>b</strong></strong>'], '']);
|
|
68
|
+
assert.deepStrictEqual(inspect(parser, input('***a*<wbr>**b****', new Context())), [['<strong><em>a</em><wbr><strong>b</strong></strong>'], '']);
|
|
69
|
+
assert.deepStrictEqual(inspect(parser, input('***a*b **', new Context())), [['**', '<em>a</em>', 'b', ' ', '**'], '']);
|
|
70
|
+
assert.deepStrictEqual(inspect(parser, input('***a*b\\ **', new Context())), [['**', '<em>a</em>', 'b', ' ', '**'], '']);
|
|
71
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b*', new Context())), [['<em><strong>a</strong>b</em>'], '']);
|
|
72
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b*c', new Context())), [['<em><strong>a</strong>b</em>'], 'c']);
|
|
73
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b*c**', new Context())), [['<em><strong>a</strong>b</em>'], 'c**']);
|
|
74
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b**c***', new Context())), [['<em><strong>a</strong>b<strong>c</strong></em>'], '']);
|
|
75
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b**c***d', new Context())), [['<em><strong>a</strong>b<strong>c</strong></em>'], 'd']);
|
|
76
|
+
assert.deepStrictEqual(inspect(parser, input('***a** *b**', new Context())), [['<em><strong>a</strong> <em>b</em></em>'], '']);
|
|
77
|
+
assert.deepStrictEqual(inspect(parser, input('***a**\\ *b**', new Context())), [['<em><strong>a</strong> <em>b</em></em>'], '']);
|
|
78
|
+
assert.deepStrictEqual(inspect(parser, input('***a**	*b**', new Context())), [['<em><strong>a</strong>\t<em>b</em></em>'], '']);
|
|
79
|
+
assert.deepStrictEqual(inspect(parser, input('***a**<wbr>*b**', new Context())), [['<em><strong>a</strong><wbr><em>b</em></em>'], '']);
|
|
80
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b *', new Context())), [['*', '<strong>a</strong>', 'b', ' ', '*'], '']);
|
|
81
|
+
assert.deepStrictEqual(inspect(parser, input('***a**b\\ *', new Context())), [['*', '<strong>a</strong>', 'b', ' ', '*'], '']);
|
|
82
|
+
assert.deepStrictEqual(inspect(parser, input('***a*', new Context())), [['**', '<em>a</em>'], '']);
|
|
83
|
+
assert.deepStrictEqual(inspect(parser, input('***a**', new Context())), [['*', '<strong>a</strong>'], '']);
|
|
84
|
+
assert.deepStrictEqual(inspect(parser, input('***a***', new Context())), [['<em><strong>a</strong></em>'], '']);
|
|
85
|
+
assert.deepStrictEqual(inspect(parser, input('***a***b', new Context())), [['<em><strong>a</strong></em>'], 'b']);
|
|
86
|
+
assert.deepStrictEqual(inspect(parser, input('***a****', new Context())), [['<em><strong>a</strong></em>'], '*']);
|
|
87
|
+
assert.deepStrictEqual(inspect(parser, input('***a*****', new Context())), [['<em><strong>a</strong></em>'], '**']);
|
|
88
|
+
assert.deepStrictEqual(inspect(parser, input('***a******', new Context())), [['<em><strong>a</strong></em>'], '***']);
|
|
89
|
+
assert.deepStrictEqual(inspect(parser, input('****a***', new Context())), [['*', '<em><strong>a</strong></em>'], '']);
|
|
90
|
+
assert.deepStrictEqual(inspect(parser, input('****a***b', new Context())), [['*', '<em><strong>a</strong></em>', 'b'], '']);
|
|
91
|
+
assert.deepStrictEqual(inspect(parser, input('****a***b*', new Context())), [['<em><em><strong>a</strong></em>b</em>'], '']);
|
|
92
|
+
assert.deepStrictEqual(inspect(parser, input('****a****', new Context())), [['<em><em><strong>a</strong></em></em>'], '']);
|
|
93
|
+
assert.deepStrictEqual(inspect(parser, input('****a****b', new Context())), [['<em><em><strong>a</strong></em></em>'], 'b']);
|
|
94
|
+
assert.deepStrictEqual(inspect(parser, input('*****a***', new Context())), [['**', '<em><strong>a</strong></em>'], '']);
|
|
95
|
+
assert.deepStrictEqual(inspect(parser, input('*****a***b', new Context())), [['**', '<em><strong>a</strong></em>', 'b'], '']);
|
|
96
|
+
assert.deepStrictEqual(inspect(parser, input('*****a***b**', new Context())), [['<strong><em><strong>a</strong></em>b</strong>'], '']);
|
|
97
|
+
assert.deepStrictEqual(inspect(parser, input('*****a****', new Context())), [['*', '<em><em><strong>a</strong></em></em>'], '']);
|
|
98
|
+
assert.deepStrictEqual(inspect(parser, input('*****a****b', new Context())), [['*', '<em><em><strong>a</strong></em></em>', 'b'], '']);
|
|
99
|
+
assert.deepStrictEqual(inspect(parser, input('*****a****b*', new Context())), [['<em><em><em><strong>a</strong></em></em>b</em>'], '']);
|
|
100
|
+
assert.deepStrictEqual(inspect(parser, input('*****a*****', new Context())), [['<strong><em><strong>a</strong></em></strong>'], '']);
|
|
101
|
+
assert.deepStrictEqual(inspect(parser, input('******a***', new Context())), [['***', '<em><strong>a</strong></em>'], '']);
|
|
102
|
+
assert.deepStrictEqual(inspect(parser, input('******a***b', new Context())), [['***', '<em><strong>a</strong></em>', 'b'], '']);
|
|
103
|
+
assert.deepStrictEqual(inspect(parser, input('******a****', new Context())), [['**', '<em><em><strong>a</strong></em></em>'], '']);
|
|
104
|
+
assert.deepStrictEqual(inspect(parser, input('******a****b', new Context())), [['**', '<em><em><strong>a</strong></em></em>', 'b'], '']);
|
|
105
|
+
assert.deepStrictEqual(inspect(parser, input('******a****b**', new Context())), [['<strong><em><em><strong>a</strong></em></em>b</strong>'], '']);
|
|
106
|
+
assert.deepStrictEqual(inspect(parser, input('******a*****', new Context())), [['*', '<strong><em><strong>a</strong></em></strong>'], '']);
|
|
107
|
+
assert.deepStrictEqual(inspect(parser, input('******a*****b', new Context())), [['*', '<strong><em><strong>a</strong></em></strong>', 'b'], '']);
|
|
108
|
+
assert.deepStrictEqual(inspect(parser, input('******a*****b*', new Context())), [['<em><strong><em><strong>a</strong></em></strong>b</em>'], '']);
|
|
109
|
+
assert.deepStrictEqual(inspect(parser, input('******a******', new Context())), [['<em><strong><em><strong>a</strong></em></strong></em>'], '']);
|
|
110
|
+
assert.deepStrictEqual(inspect(parser, input('******a******b', new Context())), [['<em><strong><em><strong>a</strong></em></strong></em>'], 'b']);
|
|
111
|
+
assert.deepStrictEqual(inspect(parser, input('******a*b', new Context())), [['*****', '<em>a</em>', 'b'], '']);
|
|
112
|
+
assert.deepStrictEqual(inspect(parser, input('******a*b *', new Context())), [['*****', '<em>a</em>', 'b', ' ', '*'], '']);
|
|
113
|
+
assert.deepStrictEqual(inspect(parser, input('******a*b **', new Context())), [['*****', '<em>a</em>', 'b', ' ', '**'], '']);
|
|
114
|
+
assert.deepStrictEqual(inspect(parser, input('******a*b ***', new Context())), [['*****', '<em>a</em>', 'b', ' ', '***'], '']);
|
|
115
|
+
assert.deepStrictEqual(inspect(parser, input('******a*b ****', new Context())), [['*****', '<em>a</em>', 'b', ' ', '****'], '']);
|
|
116
|
+
assert.deepStrictEqual(inspect(parser, input('******a*b *****', new Context())), [['*****', '<em>a</em>', 'b', ' ', '*****'], '']);
|
|
117
117
|
});
|
|
118
118
|
|
|
119
119
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EmStrongParser, EmphasisParser, StrongParser } from '../inline';
|
|
2
2
|
import { Recursion, Command } from '../context';
|
|
3
|
-
import { Result, List,
|
|
3
|
+
import { Parser, Result, List, Node } from '../../combinator/data/parser';
|
|
4
4
|
import { union, some, recursion, precedence, surround, open, lazy, bind } from '../../combinator';
|
|
5
5
|
import { inline } from '../inline';
|
|
6
6
|
import { strong } from './strong';
|
|
@@ -10,12 +10,12 @@ import { tightStart, blankWith } from '../visibility';
|
|
|
10
10
|
import { unwrap, repeat } from '../util';
|
|
11
11
|
import { html, defrag } from 'typed-dom/dom';
|
|
12
12
|
|
|
13
|
-
const substrong: IntermediateParser<StrongParser> = lazy(() => some(union([
|
|
13
|
+
const substrong: Parser.IntermediateParser<StrongParser> = lazy(() => some(union([
|
|
14
14
|
emphasis,
|
|
15
15
|
some(inline, blankWith('*')),
|
|
16
16
|
open(some(inline, '*'), inline),
|
|
17
17
|
])));
|
|
18
|
-
const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
|
|
18
|
+
const subemphasis: Parser.IntermediateParser<EmphasisParser> = lazy(() => some(union([
|
|
19
19
|
strong,
|
|
20
20
|
some(inline, blankWith('*')),
|
|
21
21
|
open(some(inline, '*'), inline),
|
|
@@ -34,9 +34,9 @@ export const emstrong: EmStrongParser = lazy(() =>
|
|
|
34
34
|
])))),
|
|
35
35
|
str(/\*{1,3}/y),
|
|
36
36
|
false, [],
|
|
37
|
-
([, bs, cs], context): Result<Node<EmStrongParser>, Context<EmStrongParser>> => {
|
|
37
|
+
([, bs, cs], context): Result<Parser.Node<EmStrongParser>, Parser.Context<EmStrongParser>> => {
|
|
38
38
|
assert(cs.length === 1);
|
|
39
|
-
const { buffer
|
|
39
|
+
const { buffer } = context;
|
|
40
40
|
switch (cs.head!.value) {
|
|
41
41
|
case '***':
|
|
42
42
|
return bs;
|
|
@@ -47,18 +47,18 @@ export const emstrong: EmStrongParser = lazy(() =>
|
|
|
47
47
|
const { source } = context;
|
|
48
48
|
if (source.startsWith('*', context.position)) {
|
|
49
49
|
context.position += 1;
|
|
50
|
-
buffer.push(new
|
|
50
|
+
buffer.push(new Node(html('strong', defrag(unwrap(bs)))));
|
|
51
51
|
buffer.import(ds);
|
|
52
|
-
return new List([new
|
|
52
|
+
return new List([new Node(html('em', defrag(unwrap(buffer)))), new Node(Command.Separator)]);
|
|
53
53
|
}
|
|
54
54
|
else {
|
|
55
|
-
buffer.push(new
|
|
55
|
+
buffer.push(new Node(html('strong', defrag(unwrap(bs)))));
|
|
56
56
|
buffer.import(ds);
|
|
57
|
-
buffer.push(new
|
|
57
|
+
buffer.push(new Node(Command.Separator));
|
|
58
58
|
return prepend('*', buffer);
|
|
59
59
|
}
|
|
60
60
|
})
|
|
61
|
-
({ context }) ?? prepend('*', buffer.import(new List([new
|
|
61
|
+
({ context }) ?? prepend('*', buffer.import(new List([new Node(html('strong', defrag(unwrap(bs)))), new Node(Command.Separator)])));
|
|
62
62
|
case '*':
|
|
63
63
|
return bind<StrongParser>(
|
|
64
64
|
substrong,
|
|
@@ -66,24 +66,24 @@ export const emstrong: EmStrongParser = lazy(() =>
|
|
|
66
66
|
const { source } = context;
|
|
67
67
|
if (source.startsWith('**', context.position)) {
|
|
68
68
|
context.position += 2;
|
|
69
|
-
buffer.push(new
|
|
69
|
+
buffer.push(new Node(html('em', defrag(unwrap(bs)))));
|
|
70
70
|
buffer.import(ds);
|
|
71
|
-
return new List([new
|
|
71
|
+
return new List([new Node(html('strong', defrag(unwrap(buffer)))), new Node(Command.Separator)]);
|
|
72
72
|
}
|
|
73
73
|
else {
|
|
74
|
-
buffer.push(new
|
|
74
|
+
buffer.push(new Node(html('em', defrag(unwrap(bs)))));
|
|
75
75
|
buffer.import(ds);
|
|
76
|
-
buffer.push(new
|
|
76
|
+
buffer.push(new Node(Command.Separator));
|
|
77
77
|
return prepend('**', buffer);
|
|
78
78
|
}
|
|
79
79
|
})
|
|
80
|
-
({ context }) ?? prepend('**', buffer.import(new List([new
|
|
80
|
+
({ context }) ?? prepend('**', buffer.import(new List([new Node(html('em', defrag(unwrap(bs)))), new Node(Command.Separator)])));
|
|
81
81
|
}
|
|
82
82
|
assert(false);
|
|
83
83
|
},
|
|
84
|
-
([, bs], { buffer }) => bs && buffer
|
|
84
|
+
([, bs], { buffer }) => bs && buffer.import(bs) && buffer.push(new Node(Command.Cancel)) && buffer),
|
|
85
85
|
// 3以上の`*`に対してemの適用を保証する
|
|
86
|
-
nodes => new List([new
|
|
86
|
+
nodes => new List([new Node(html('em', [html('strong', defrag(unwrap(nodes)))]))]),
|
|
87
87
|
(nodes, context, prefix, postfix, state) => {
|
|
88
88
|
context.position += postfix;
|
|
89
89
|
assert(postfix < 3);
|
|
@@ -92,10 +92,10 @@ export const emstrong: EmStrongParser = lazy(() =>
|
|
|
92
92
|
case 0:
|
|
93
93
|
break;
|
|
94
94
|
case 1:
|
|
95
|
-
nodes = new List([new
|
|
95
|
+
nodes = new List([new Node(html('em', defrag(unwrap(nodes))))]);
|
|
96
96
|
break;
|
|
97
97
|
case 2:
|
|
98
|
-
nodes = new List([new
|
|
98
|
+
nodes = new List([new Node(html('strong', defrag(unwrap(nodes))))]);
|
|
99
99
|
break;
|
|
100
100
|
default:
|
|
101
101
|
assert(false);
|
|
@@ -112,7 +112,7 @@ export const emstrong: EmStrongParser = lazy(() =>
|
|
|
112
112
|
const { source } = context;
|
|
113
113
|
if (source.startsWith('*', context.position)) {
|
|
114
114
|
context.position += 1;
|
|
115
|
-
return new List([new
|
|
115
|
+
return new List([new Node(html('em', defrag(unwrap(nodes.import(ds)))))]);
|
|
116
116
|
}
|
|
117
117
|
else {
|
|
118
118
|
return prepend('*', nodes.import(ds));
|
|
@@ -128,7 +128,7 @@ export const emstrong: EmStrongParser = lazy(() =>
|
|
|
128
128
|
const { source } = context;
|
|
129
129
|
if (source.startsWith('**', context.position)) {
|
|
130
130
|
context.position += 2;
|
|
131
|
-
return new List([new
|
|
131
|
+
return new List([new Node(html('strong', defrag(unwrap(nodes.import(ds)))))]);
|
|
132
132
|
}
|
|
133
133
|
else {
|
|
134
134
|
return prepend('**', nodes.import(ds));
|
|
@@ -145,12 +145,12 @@ export const emstrong: EmStrongParser = lazy(() =>
|
|
|
145
145
|
return nodes;
|
|
146
146
|
})));
|
|
147
147
|
|
|
148
|
-
function prepend<N>(prefix: string, nodes: List<
|
|
148
|
+
function prepend<N>(prefix: string, nodes: List<Node<N>>): List<Node<N>> {
|
|
149
149
|
if (typeof nodes.head?.value === 'string') {
|
|
150
150
|
nodes.head.value = prefix + nodes.head.value as N;
|
|
151
151
|
}
|
|
152
152
|
else {
|
|
153
|
-
nodes.unshift(new
|
|
153
|
+
nodes.unshift(new Node(prefix as N));
|
|
154
154
|
}
|
|
155
155
|
return nodes;
|
|
156
156
|
}
|