securemark 0.291.1 → 0.293.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 +8 -0
- package/design.md +13 -2
- package/dist/index.js +1353 -908
- package/markdown.d.ts +32 -49
- 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 +21 -38
- package/src/combinator/control/constraint/line.test.ts +9 -6
- package/src/combinator/control/constraint/line.ts +21 -22
- package/src/combinator/control/manipulation/clear.ts +3 -4
- package/src/combinator/control/manipulation/convert.ts +29 -13
- package/src/combinator/control/manipulation/fence.ts +20 -15
- package/src/combinator/control/manipulation/indent.test.ts +17 -14
- package/src/combinator/control/manipulation/indent.ts +14 -13
- package/src/combinator/control/manipulation/match.ts +13 -11
- package/src/combinator/control/manipulation/recovery.ts +7 -3
- package/src/combinator/control/manipulation/scope.ts +36 -44
- package/src/combinator/control/manipulation/surround.ts +69 -71
- 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 +10 -8
- package/src/combinator/data/parser/context.test.ts +19 -14
- package/src/combinator/data/parser/context.ts +51 -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 +20 -19
- package/src/combinator/data/parser/some.ts +14 -17
- 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 +65 -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 +26 -19
- package/src/parser/api/parse.ts +4 -5
- package/src/parser/autolink.test.ts +19 -17
- package/src/parser/autolink.ts +2 -4
- package/src/parser/block/blockquote.test.ts +86 -84
- package/src/parser/block/blockquote.ts +10 -8
- package/src/parser/block/codeblock.test.ts +58 -56
- package/src/parser/block/codeblock.ts +4 -4
- package/src/parser/block/dlist.test.ts +58 -56
- package/src/parser/block/dlist.ts +6 -6
- package/src/parser/block/extension/aside.test.ts +10 -8
- package/src/parser/block/extension/aside.ts +2 -2
- package/src/parser/block/extension/example.test.ts +20 -18
- package/src/parser/block/extension/example.ts +4 -4
- package/src/parser/block/extension/fig.test.ts +38 -36
- package/src/parser/block/extension/fig.ts +4 -4
- package/src/parser/block/extension/figbase.test.ts +17 -15
- package/src/parser/block/extension/figbase.ts +1 -1
- package/src/parser/block/extension/figure.test.ts +64 -62
- package/src/parser/block/extension/figure.ts +7 -6
- package/src/parser/block/extension/message.test.ts +15 -13
- package/src/parser/block/extension/message.ts +4 -4
- package/src/parser/block/extension/placeholder.test.ts +3 -1
- package/src/parser/block/extension/placeholder.ts +1 -1
- package/src/parser/block/extension/table.test.ts +72 -70
- package/src/parser/block/extension/table.ts +19 -19
- package/src/parser/block/extension.test.ts +3 -1
- package/src/parser/block/extension.ts +2 -2
- package/src/parser/block/heading.test.ts +65 -64
- package/src/parser/block/heading.ts +5 -5
- package/src/parser/block/ilist.test.ts +6 -4
- package/src/parser/block/ilist.ts +7 -7
- package/src/parser/block/mathblock.test.ts +33 -31
- package/src/parser/block/mathblock.ts +2 -2
- package/src/parser/block/mediablock.ts +3 -3
- package/src/parser/block/olist.test.ts +101 -97
- package/src/parser/block/olist.ts +14 -14
- package/src/parser/block/pagebreak.test.ts +17 -15
- package/src/parser/block/pagebreak.ts +2 -2
- package/src/parser/block/paragraph.test.ts +60 -57
- package/src/parser/block/paragraph.ts +2 -2
- package/src/parser/block/reply/cite.test.ts +41 -39
- package/src/parser/block/reply/cite.ts +4 -4
- package/src/parser/block/reply/quote.test.ts +52 -50
- package/src/parser/block/reply/quote.ts +5 -4
- package/src/parser/block/reply.test.ts +21 -19
- package/src/parser/block/reply.ts +3 -3
- package/src/parser/block/sidefence.test.ts +51 -49
- package/src/parser/block/sidefence.ts +3 -3
- package/src/parser/block/table.test.ts +51 -50
- package/src/parser/block/table.ts +14 -14
- package/src/parser/block/ulist.test.ts +53 -50
- package/src/parser/block/ulist.ts +8 -8
- package/src/parser/block.ts +53 -19
- package/src/parser/context.ts +1 -0
- package/src/parser/header.test.ts +22 -21
- package/src/parser/header.ts +28 -16
- 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 +33 -30
- package/src/parser/inline/autolink/account.ts +12 -9
- package/src/parser/inline/autolink/anchor.test.ts +23 -21
- package/src/parser/inline/autolink/anchor.ts +21 -17
- package/src/parser/inline/autolink/channel.test.ts +16 -14
- package/src/parser/inline/autolink/channel.ts +40 -15
- package/src/parser/inline/autolink/email.test.ts +38 -36
- package/src/parser/inline/autolink/email.ts +7 -9
- package/src/parser/inline/autolink/hashnum.test.ts +34 -37
- package/src/parser/inline/autolink/hashnum.ts +9 -5
- package/src/parser/inline/autolink/hashtag.test.ts +57 -56
- package/src/parser/inline/autolink/hashtag.ts +10 -7
- package/src/parser/inline/autolink/url.test.ts +75 -75
- package/src/parser/inline/autolink/url.ts +24 -28
- package/src/parser/inline/autolink.ts +21 -24
- package/src/parser/inline/bracket.test.ts +69 -67
- package/src/parser/inline/bracket.ts +35 -35
- 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 +3 -3
- package/src/parser/inline/emphasis.test.ts +40 -36
- package/src/parser/inline/emphasis.ts +4 -9
- package/src/parser/inline/emstrong.test.ts +102 -96
- package/src/parser/inline/emstrong.ts +93 -45
- package/src/parser/inline/extension/index.test.ts +93 -89
- package/src/parser/inline/extension/index.ts +16 -31
- 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 +3 -3
- package/src/parser/inline/extension/label.test.ts +34 -32
- package/src/parser/inline/extension/label.ts +1 -1
- package/src/parser/inline/extension/placeholder.test.ts +44 -42
- package/src/parser/inline/extension/placeholder.ts +12 -9
- package/src/parser/inline/html.test.ts +108 -106
- package/src/parser/inline/html.ts +38 -37
- 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 +3 -3
- package/src/parser/inline/italic.test.ts +55 -53
- package/src/parser/inline/italic.ts +3 -3
- package/src/parser/inline/link.test.ts +187 -185
- package/src/parser/inline/link.ts +45 -27
- package/src/parser/inline/mark.test.ts +31 -29
- package/src/parser/inline/mark.ts +4 -4
- package/src/parser/inline/math.test.ts +133 -131
- package/src/parser/inline/math.ts +9 -13
- package/src/parser/inline/media.test.ts +93 -91
- package/src/parser/inline/media.ts +50 -26
- package/src/parser/inline/reference.test.ts +110 -108
- package/src/parser/inline/reference.ts +50 -41
- package/src/parser/inline/remark.test.ts +53 -51
- package/src/parser/inline/remark.ts +5 -5
- package/src/parser/inline/ruby.test.ts +46 -44
- package/src/parser/inline/ruby.ts +26 -27
- package/src/parser/inline/shortmedia.test.ts +11 -9
- package/src/parser/inline/shortmedia.ts +6 -9
- package/src/parser/inline/strong.test.ts +37 -33
- package/src/parser/inline/strong.ts +7 -9
- package/src/parser/inline/template.test.ts +24 -22
- package/src/parser/inline/template.ts +20 -11
- package/src/parser/inline.test.ts +223 -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 +50 -41
- package/src/parser/source/line.test.ts +19 -17
- package/src/parser/source/line.ts +28 -4
- package/src/parser/source/str.ts +18 -23
- package/src/parser/source/text.test.ts +85 -83
- package/src/parser/source/text.ts +78 -54
- package/src/parser/source/unescapable.test.ts +24 -22
- package/src/parser/source/unescapable.ts +42 -33
- package/src/parser/source.ts +1 -1
- package/src/parser/util.ts +39 -36
- package/src/parser/visibility.ts +33 -24
- package/src/util/quote.ts +4 -2
|
@@ -1,141 +1,145 @@
|
|
|
1
1
|
import { olist } from './olist';
|
|
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/block/olist', () => {
|
|
6
7
|
describe('olist', () => {
|
|
7
|
-
const parser = (source: string) => some(olist)(
|
|
8
|
+
const parser = (source: string) => some(olist)(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('\n')), undefined);
|
|
12
|
-
assert.deepStrictEqual(inspect(parser('1a. ')), undefined);
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('a1. ')), undefined);
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('aZ. ')), undefined);
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('Az. ')), undefined);
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('1')), undefined);
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('1 ')), undefined);
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('1\n')), undefined);
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('1.')), undefined);
|
|
20
|
-
assert.deepStrictEqual(inspect(parser('1.a')), undefined);
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('1')), undefined);
|
|
22
|
-
assert.deepStrictEqual(inspect(parser('1 ')), undefined);
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('1\n')), undefined);
|
|
24
|
-
assert.deepStrictEqual(inspect(parser('1.')), undefined);
|
|
25
|
-
assert.deepStrictEqual(inspect(parser('1.1')), undefined);
|
|
26
|
-
assert.deepStrictEqual(inspect(parser('1.1.')), undefined);
|
|
27
|
-
assert.deepStrictEqual(inspect(parser('1.a')), undefined);
|
|
28
|
-
assert.deepStrictEqual(inspect(parser('1.\n')), undefined);
|
|
29
|
-
assert.deepStrictEqual(inspect(parser('
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('(1)
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('(
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('(
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('
|
|
12
|
+
assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser('\n'), ctx), undefined);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser('1a. '), ctx), undefined);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser('a1. '), ctx), undefined);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser('aZ. '), ctx), undefined);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('Az. '), ctx), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser('1'), ctx), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser('1 '), ctx), undefined);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser('1\n'), ctx), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser('1.'), ctx), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser('1.a'), ctx), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser('1'), ctx), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser('1 '), ctx), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser('1\n'), ctx), undefined);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser('1.'), ctx), undefined);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser('1.1'), ctx), undefined);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser('1.1.'), ctx), undefined);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser('1.a'), ctx), undefined);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser('1.\n'), ctx), undefined);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser('1.\n1. a'), ctx), undefined);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser('(1)'), ctx), undefined);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser('(1)\n'), ctx), undefined);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser('(1)\n(1) a'), ctx), undefined);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser('(I) '), ctx), undefined);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser('(A) '), ctx), undefined);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser(' 1. '), ctx), undefined);
|
|
34
38
|
});
|
|
35
39
|
|
|
36
40
|
it('single', () => {
|
|
37
41
|
// pending
|
|
38
|
-
assert.deepStrictEqual(inspect(parser('1. ')), [['<ol><li></li></ol>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser('1. '), ctx), [['<ol><li></li></ol>'], '']);
|
|
39
43
|
// filled
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('1. \\')), [['<ol><li id="index::\\">\\</li></ol>'], '']);
|
|
41
|
-
assert.deepStrictEqual(inspect(parser('1. \\\n')), [['<ol><li id="index::\\">\\</li></ol>'], '']);
|
|
42
|
-
assert.deepStrictEqual(inspect(parser('1. -')), [['<ol><li id="index::-">-</li></ol>'], '']);
|
|
43
|
-
assert.deepStrictEqual(inspect(parser('1. -\n')), [['<ol><li id="index::-">-</li></ol>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser('1. \\'), ctx), [['<ol><li id="index::\\">\\</li></ol>'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser('1. \\\n'), ctx), [['<ol><li id="index::\\">\\</li></ol>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser('1. -'), ctx), [['<ol><li id="index::-">-</li></ol>'], '']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser('1. -\n'), ctx), [['<ol><li id="index::-">-</li></ol>'], '']);
|
|
44
48
|
// pending
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('(1) ')), [['<ol data-format="paren"><li></li></ol>'], '']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser('(1) '), ctx), [['<ol data-format="paren"><li></li></ol>'], '']);
|
|
46
50
|
// filled
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('(1) a')), [['<ol data-format="paren"><li id="index::a">a</li></ol>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser('(1) a'), ctx), [['<ol data-format="paren"><li id="index::a">a</li></ol>'], '']);
|
|
48
52
|
});
|
|
49
53
|
|
|
50
54
|
it('multiple', () => {
|
|
51
55
|
// pending
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('0
|
|
53
|
-
assert.deepStrictEqual(inspect(parser('0
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('0
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('0
|
|
56
|
-
assert.deepStrictEqual(inspect(parser('0
|
|
56
|
+
assert.deepStrictEqual(inspect(parser('0. \n0'), ctx), [['<ol><li></li><li></li></ol>'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser('0. \n0\n'), ctx), [['<ol><li></li><li></li></ol>'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser('0. \n0.'), ctx), [['<ol><li></li><li></li></ol>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser('0. \n0. '), ctx), [['<ol><li></li><li></li></ol>'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser('0. \n0.\n'), ctx), [['<ol><li></li><li></li></ol>'], '']);
|
|
57
61
|
// filled
|
|
58
|
-
assert.deepStrictEqual(inspect(parser('0. 1\n0. 2')), [['<ol><li id="index::1">1</li><li id="index::2">2</li></ol>'], '']);
|
|
59
|
-
assert.deepStrictEqual(inspect(parser('0. 1\n0. 2\n0. 3')), [['<ol><li id="index::1">1</li><li id="index::2">2</li><li id="index::3">3</li></ol>'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser('0. 1\n0. 2'), ctx), [['<ol><li id="index::1">1</li><li id="index::2">2</li></ol>'], '']);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser('0. 1\n0. 2\n0. 3'), ctx), [['<ol><li id="index::1">1</li><li id="index::2">2</li><li id="index::3">3</li></ol>'], '']);
|
|
60
64
|
// pending
|
|
61
|
-
assert.deepStrictEqual(inspect(parser('(1) \n(')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
62
|
-
assert.deepStrictEqual(inspect(parser('(1) \n(\n')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
63
|
-
assert.deepStrictEqual(inspect(parser('(1) \n(1')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
64
|
-
assert.deepStrictEqual(inspect(parser('(1) \n(1\n')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
65
|
-
assert.deepStrictEqual(inspect(parser('(1) \n(1)')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
66
|
-
assert.deepStrictEqual(inspect(parser('(1) \n(1)\n')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
65
|
+
assert.deepStrictEqual(inspect(parser('(1) \n('), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
66
|
+
assert.deepStrictEqual(inspect(parser('(1) \n(\n'), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
67
|
+
assert.deepStrictEqual(inspect(parser('(1) \n(1'), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
68
|
+
assert.deepStrictEqual(inspect(parser('(1) \n(1\n'), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
69
|
+
assert.deepStrictEqual(inspect(parser('(1) \n(1)'), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
70
|
+
assert.deepStrictEqual(inspect(parser('(1) \n(1)\n'), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
67
71
|
// filled
|
|
68
|
-
assert.deepStrictEqual(inspect(parser('(1) \n(1) ')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
72
|
+
assert.deepStrictEqual(inspect(parser('(1) \n(1) '), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
|
|
69
73
|
// invalid
|
|
70
|
-
assert.deepStrictEqual(inspect(parser('0. \n0 ')), [['<ol><li></li><li id="index::0"><span class="invalid">0 </span></li></ol>'], '']);
|
|
74
|
+
assert.deepStrictEqual(inspect(parser('0. \n0 '), ctx), [['<ol><li></li><li id="index::0"><span class="invalid">0 </span></li></ol>'], '']);
|
|
71
75
|
});
|
|
72
76
|
|
|
73
77
|
it('nest', () => {
|
|
74
|
-
assert.deepStrictEqual(inspect(parser('0
|
|
75
|
-
assert.deepStrictEqual(inspect(parser('0. 1\n 0')), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
|
|
76
|
-
assert.deepStrictEqual(inspect(parser('0. 1\n 0.')), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
|
|
77
|
-
assert.deepStrictEqual(inspect(parser('0. 1\n 0. ')), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
|
|
78
|
-
assert.deepStrictEqual(inspect(parser('0. 1\n 0.\n')), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
|
|
79
|
-
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2')), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li></ol>'], '']);
|
|
80
|
-
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n0. 3')), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::3">3</li></ol>'], '']);
|
|
81
|
-
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3')), [['<ol><li id="index::1">1<ol><li id="index::2">2</li><li id="index::3">3</li></ol></li></ol>'], '']);
|
|
82
|
-
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3')), [['<ol><li id="index::1">1<ol><li id="index::2">2<ol><li id="index::3">3</li></ol></li></ol></li></ol>'], '']);
|
|
83
|
-
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3')), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::0._3"><span class="invalid"> 0. 3</span></li></ol>'], '']);
|
|
84
|
-
assert.deepStrictEqual(inspect(parser('0. a [#b]')), [['<ol><li id="index::a_b">a <a class="index" href="#index::b">b</a></li></ol>'], '']);
|
|
85
|
-
assert.deepStrictEqual(inspect(parser('0. http://host\\')), [['<ol><li id="index::http://host\\"><a class="url" href="http://host\\" target="_blank">http://host\\</a></li></ol>'], '']);
|
|
86
|
-
assert.deepStrictEqual(inspect(parser('0. !http://host')), [['<ol><li id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></li></ol>'], '']);
|
|
78
|
+
assert.deepStrictEqual(inspect(parser('0. \n 0'), ctx), [['<ol><li><br><ol><li></li></ol></li></ol>'], '']);
|
|
79
|
+
assert.deepStrictEqual(inspect(parser('0. 1\n 0'), ctx), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
|
|
80
|
+
assert.deepStrictEqual(inspect(parser('0. 1\n 0.'), ctx), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
|
|
81
|
+
assert.deepStrictEqual(inspect(parser('0. 1\n 0. '), ctx), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
|
|
82
|
+
assert.deepStrictEqual(inspect(parser('0. 1\n 0.\n'), ctx), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
|
|
83
|
+
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2'), ctx), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li></ol>'], '']);
|
|
84
|
+
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n0. 3'), ctx), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::3">3</li></ol>'], '']);
|
|
85
|
+
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3'), ctx), [['<ol><li id="index::1">1<ol><li id="index::2">2</li><li id="index::3">3</li></ol></li></ol>'], '']);
|
|
86
|
+
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3'), ctx), [['<ol><li id="index::1">1<ol><li id="index::2">2<ol><li id="index::3">3</li></ol></li></ol></li></ol>'], '']);
|
|
87
|
+
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3'), ctx), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::0._3"><span class="invalid"> 0. 3</span></li></ol>'], '']);
|
|
88
|
+
assert.deepStrictEqual(inspect(parser('0. a [#b]'), ctx), [['<ol><li id="index::a_b">a <a class="index" href="#index::b">b</a></li></ol>'], '']);
|
|
89
|
+
assert.deepStrictEqual(inspect(parser('0. http://host\\'), ctx), [['<ol><li id="index::http://host\\"><a class="url" href="http://host\\" target="_blank">http://host\\</a></li></ol>'], '']);
|
|
90
|
+
assert.deepStrictEqual(inspect(parser('0. !http://host'), ctx), [['<ol><li id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></li></ol>'], '']);
|
|
87
91
|
});
|
|
88
92
|
|
|
89
93
|
it('index', () => {
|
|
90
|
-
assert.deepStrictEqual(inspect(parser('1. ')), [['<ol><li></li></ol>'], '']);
|
|
91
|
-
assert.deepStrictEqual(inspect(parser('9. ')), [['<ol><li data-marker="9."></li></ol>'], '']);
|
|
92
|
-
assert.deepStrictEqual(inspect(parser('00. ')), [['<ol><li data-marker="00."></li></ol>'], '']);
|
|
93
|
-
assert.deepStrictEqual(inspect(parser('01. ')), [['<ol><li data-marker="01."></li></ol>'], '']);
|
|
94
|
-
assert.deepStrictEqual(inspect(parser('0
|
|
95
|
-
assert.deepStrictEqual(inspect(parser('8
|
|
96
|
-
assert.deepStrictEqual(inspect(parser('9
|
|
94
|
+
assert.deepStrictEqual(inspect(parser('1. '), ctx), [['<ol><li></li></ol>'], '']);
|
|
95
|
+
assert.deepStrictEqual(inspect(parser('9. '), ctx), [['<ol><li data-marker="9."></li></ol>'], '']);
|
|
96
|
+
assert.deepStrictEqual(inspect(parser('00. '), ctx), [['<ol><li data-marker="00."></li></ol>'], '']);
|
|
97
|
+
assert.deepStrictEqual(inspect(parser('01. '), ctx), [['<ol><li data-marker="01."></li></ol>'], '']);
|
|
98
|
+
assert.deepStrictEqual(inspect(parser('0. \n1'), ctx), [['<ol><li></li><li data-marker="1."></li></ol>'], '']);
|
|
99
|
+
assert.deepStrictEqual(inspect(parser('8. \n9'), ctx), [['<ol><li data-marker="8."></li><li data-marker="9."></li></ol>'], '']);
|
|
100
|
+
assert.deepStrictEqual(inspect(parser('9. \n9'), ctx), [['<ol><li data-marker="9."></li><li data-marker="9." class="invalid"></li></ol>'], '']);
|
|
97
101
|
});
|
|
98
102
|
|
|
99
103
|
it('branch', () => {
|
|
100
|
-
assert.deepStrictEqual(inspect(parser('1-1. ')), [['<ol><li data-marker="1-1."></li></ol>'], '']);
|
|
101
|
-
assert.deepStrictEqual(inspect(parser('1-1-1. ')), [['<ol><li data-marker="1-1-1."></li></ol>'], '']);
|
|
102
|
-
assert.deepStrictEqual(inspect(parser('1
|
|
103
|
-
assert.deepStrictEqual(inspect(parser('1
|
|
104
|
-
assert.deepStrictEqual(inspect(parser('(1)-1 ')), [['<ol data-format="paren"><li data-marker="(1)-1"></li></ol>'], '']);
|
|
105
|
-
assert.deepStrictEqual(inspect(parser('(1)-1-1 ')), [['<ol data-format="paren"><li data-marker="(1)-1-1"></li></ol>'], '']);
|
|
106
|
-
assert.deepStrictEqual(inspect(parser('(1) \n(1)-')), [['<ol data-format="paren"><li></li><li data-marker="(1)-"></li></ol>'], '']);
|
|
107
|
-
assert.deepStrictEqual(inspect(parser('(1) \n(1)-1')), [['<ol data-format="paren"><li></li><li data-marker="(1)-1"></li></ol>'], '']);
|
|
108
|
-
assert.deepStrictEqual(inspect(parser('1. \n1--')), [['<ol><li></li><li id="index::1--"><span class="invalid">1--</span></li></ol>'], '']);
|
|
109
|
-
assert.deepStrictEqual(inspect(parser('1. \n1--. ')), [['<ol><li></li><li id="index::1--."><span class="invalid">1--. </span></li></ol>'], '']);
|
|
110
|
-
assert.deepStrictEqual(inspect(parser('(1) \n(1)--')), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)--</span></li></ol>'], '']);
|
|
111
|
-
assert.deepStrictEqual(inspect(parser('(1) \n(1)-- ')), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)-- </span></li></ol>'], '']);
|
|
112
|
-
assert.deepStrictEqual(inspect(parser('1-1. 1')), [['<ol><li data-marker="1-1." id="index::1">1</li></ol>'], '']);
|
|
104
|
+
assert.deepStrictEqual(inspect(parser('1-1. '), ctx), [['<ol><li data-marker="1-1."></li></ol>'], '']);
|
|
105
|
+
assert.deepStrictEqual(inspect(parser('1-1-1. '), ctx), [['<ol><li data-marker="1-1-1."></li></ol>'], '']);
|
|
106
|
+
assert.deepStrictEqual(inspect(parser('1. \n1-'), ctx), [['<ol><li></li><li data-marker="1-."></li></ol>'], '']);
|
|
107
|
+
assert.deepStrictEqual(inspect(parser('1. \n1-1'), ctx), [['<ol><li></li><li data-marker="1-1."></li></ol>'], '']);
|
|
108
|
+
assert.deepStrictEqual(inspect(parser('(1)-1 '), ctx), [['<ol data-format="paren"><li data-marker="(1)-1"></li></ol>'], '']);
|
|
109
|
+
assert.deepStrictEqual(inspect(parser('(1)-1-1 '), ctx), [['<ol data-format="paren"><li data-marker="(1)-1-1"></li></ol>'], '']);
|
|
110
|
+
assert.deepStrictEqual(inspect(parser('(1) \n(1)-'), ctx), [['<ol data-format="paren"><li></li><li data-marker="(1)-"></li></ol>'], '']);
|
|
111
|
+
assert.deepStrictEqual(inspect(parser('(1) \n(1)-1'), ctx), [['<ol data-format="paren"><li></li><li data-marker="(1)-1"></li></ol>'], '']);
|
|
112
|
+
assert.deepStrictEqual(inspect(parser('1. \n1--'), ctx), [['<ol><li></li><li id="index::1--"><span class="invalid">1--</span></li></ol>'], '']);
|
|
113
|
+
assert.deepStrictEqual(inspect(parser('1. \n1--. '), ctx), [['<ol><li></li><li id="index::1--."><span class="invalid">1--. </span></li></ol>'], '']);
|
|
114
|
+
assert.deepStrictEqual(inspect(parser('(1) \n(1)--'), ctx), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)--</span></li></ol>'], '']);
|
|
115
|
+
assert.deepStrictEqual(inspect(parser('(1) \n(1)-- '), ctx), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)-- </span></li></ol>'], '']);
|
|
116
|
+
assert.deepStrictEqual(inspect(parser('1-1. 1'), ctx), [['<ol><li data-marker="1-1." id="index::1">1</li></ol>'], '']);
|
|
113
117
|
});
|
|
114
118
|
|
|
115
119
|
it('type', () => {
|
|
116
|
-
assert.deepStrictEqual(inspect(parser('i. ')), [['<ol type="i" data-type="lower-roman"><li></li></ol>'], '']);
|
|
117
|
-
assert.deepStrictEqual(inspect(parser('a. ')), [['<ol type="a" data-type="lower-alpha"><li></li></ol>'], '']);
|
|
118
|
-
assert.deepStrictEqual(inspect(parser('I. ')), [['<ol type="I" data-type="upper-roman"><li></li></ol>'], '']);
|
|
119
|
-
assert.deepStrictEqual(inspect(parser('A. ')), [['<ol type="A" data-type="upper-alpha"><li></li></ol>'], '']);
|
|
120
|
-
assert.deepStrictEqual(inspect(parser('a
|
|
121
|
-
assert.deepStrictEqual(inspect(parser('i. 1')), [['<ol type="i" data-type="lower-roman"><li id="index::1">1</li></ol>'], '']);
|
|
120
|
+
assert.deepStrictEqual(inspect(parser('i. '), ctx), [['<ol type="i" data-type="lower-roman"><li></li></ol>'], '']);
|
|
121
|
+
assert.deepStrictEqual(inspect(parser('a. '), ctx), [['<ol type="a" data-type="lower-alpha"><li></li></ol>'], '']);
|
|
122
|
+
assert.deepStrictEqual(inspect(parser('I. '), ctx), [['<ol type="I" data-type="upper-roman"><li></li></ol>'], '']);
|
|
123
|
+
assert.deepStrictEqual(inspect(parser('A. '), ctx), [['<ol type="A" data-type="upper-alpha"><li></li></ol>'], '']);
|
|
124
|
+
assert.deepStrictEqual(inspect(parser('a. \n1.\nc'), ctx), [['<ol type="a" data-type="lower-alpha"><li></li><li data-marker="1."></li><li data-marker="c."></li></ol>'], '']);
|
|
125
|
+
assert.deepStrictEqual(inspect(parser('i. 1'), ctx), [['<ol type="i" data-type="lower-roman"><li id="index::1">1</li></ol>'], '']);
|
|
122
126
|
});
|
|
123
127
|
|
|
124
128
|
it('checkbox', () => {
|
|
125
|
-
assert.deepStrictEqual(inspect(parser('1. [ ]')), [['<ol class="checklist"><li><span class="checkbox">☐</span></li></ol>'], '']);
|
|
126
|
-
assert.deepStrictEqual(inspect(parser('1. [x]')), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
|
|
127
|
-
assert.deepStrictEqual(inspect(parser('1. [X]')), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
|
|
128
|
-
assert.deepStrictEqual(inspect(parser('1. [X] 1')), [['<ol class="checklist"><li id="index::1"><span class="checkbox">☑</span>1</li></ol>'], '']);
|
|
129
|
+
assert.deepStrictEqual(inspect(parser('1. [ ]'), ctx), [['<ol class="checklist"><li><span class="checkbox">☐</span></li></ol>'], '']);
|
|
130
|
+
assert.deepStrictEqual(inspect(parser('1. [x]'), ctx), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
|
|
131
|
+
assert.deepStrictEqual(inspect(parser('1. [X]'), ctx), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
|
|
132
|
+
assert.deepStrictEqual(inspect(parser('1. [X] 1'), ctx), [['<ol class="checklist"><li id="index::1"><span class="checkbox">☑</span>1</li></ol>'], '']);
|
|
129
133
|
});
|
|
130
134
|
|
|
131
135
|
it('indexer', () => {
|
|
132
|
-
assert.deepStrictEqual(inspect(parser('1. [|a]')), [['<ol><li id="index::[|a]">[|a]</li></ol>'], '']);
|
|
133
|
-
assert.deepStrictEqual(inspect(parser('1. a [|]')), [['<ol><li>a<span class="indexer" data-index=""></span></li></ol>'], '']);
|
|
134
|
-
assert.deepStrictEqual(inspect(parser('1. a [|b]')), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span></li></ol>'], '']);
|
|
135
|
-
assert.deepStrictEqual(inspect(parser('1. [ ] [|a]')), [['<ol class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span>[|a]</li></ol>'], '']);
|
|
136
|
-
assert.deepStrictEqual(inspect(parser('1. [ ] a [|b]')), [['<ol class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ol>'], '']);
|
|
137
|
-
assert.deepStrictEqual(inspect(parser('1. a [|]\n 1. c [|d]')), [['<ol><li>a<span class="indexer" data-index=""></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
|
|
138
|
-
assert.deepStrictEqual(inspect(parser('1. a [|b]\n 1. c [|d]')), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
|
|
136
|
+
assert.deepStrictEqual(inspect(parser('1. [|a]'), ctx), [['<ol><li id="index::[|a]"><span class="invalid">[|a]</span></li></ol>'], '']);
|
|
137
|
+
assert.deepStrictEqual(inspect(parser('1. a [|]'), ctx), [['<ol><li>a<span class="indexer" data-index=""></span></li></ol>'], '']);
|
|
138
|
+
assert.deepStrictEqual(inspect(parser('1. a [|b]'), ctx), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span></li></ol>'], '']);
|
|
139
|
+
assert.deepStrictEqual(inspect(parser('1. [ ] [|a]'), ctx), [['<ol class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span><span class="invalid">[|a]</span></li></ol>'], '']);
|
|
140
|
+
assert.deepStrictEqual(inspect(parser('1. [ ] a [|b]'), ctx), [['<ol class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ol>'], '']);
|
|
141
|
+
assert.deepStrictEqual(inspect(parser('1. a [|]\n 1. c [|d]'), ctx), [['<ol><li>a<span class="indexer" data-index=""></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
|
|
142
|
+
assert.deepStrictEqual(inspect(parser('1. a [|b]\n 1. c [|d]'), ctx), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
|
|
139
143
|
});
|
|
140
144
|
|
|
141
145
|
});
|
|
@@ -4,21 +4,21 @@ import { union, inits, subsequence, some, recursion, block, line, validate, inde
|
|
|
4
4
|
import { ulist_, checkbox, fillFirstLine } from './ulist';
|
|
5
5
|
import { ilist_, ilistitem } from './ilist';
|
|
6
6
|
import { inline, indexee, indexer, dataindex } from '../inline';
|
|
7
|
-
import { invalid,
|
|
7
|
+
import { invalid, linearize } from '../util';
|
|
8
8
|
import { visualize, trimBlank } from '../visibility';
|
|
9
9
|
import { memoize } from 'spica/memoize';
|
|
10
10
|
import { html, define, defrag } from 'typed-dom/dom';
|
|
11
11
|
|
|
12
12
|
const openers = {
|
|
13
|
-
'.':
|
|
14
|
-
'(':
|
|
13
|
+
'.': /([0-9]+|[a-z]+|[A-Z]+)(?:-(?=$|[0-9\n])[0-9]*)*(?:\.?(?:$|[\n])|\. )/y,
|
|
14
|
+
'(': /\((?=$|[0-9a-z\n])([0-9]*|[a-z]*)(?=$|[)\n])\)?(?:-(?=$|[0-9\n])[0-9]*)*(?:$|[ \n])/y,
|
|
15
15
|
} as const;
|
|
16
16
|
|
|
17
17
|
export const olist: OListParser = lazy(() => block(validate(
|
|
18
18
|
new RegExp([
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
].join('|')),
|
|
19
|
+
/([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*\. /y.source,
|
|
20
|
+
/\(([0-9]+|[a-z]+)\)(?:-[0-9]+)* /y.source,
|
|
21
|
+
].join('|'), 'y'),
|
|
22
22
|
olist_)));
|
|
23
23
|
|
|
24
24
|
export const olist_: OListParser = lazy(() => block(union([
|
|
@@ -36,7 +36,7 @@ const list = (type: string, form: string): OListParser.ListParser => fmap(
|
|
|
36
36
|
inits([
|
|
37
37
|
line(open(heads[form], subsequence([
|
|
38
38
|
checkbox,
|
|
39
|
-
trim(visualize(
|
|
39
|
+
trim(visualize(linearize(trimBlank(some(union([indexer, inline]))), -1)))]), true)),
|
|
40
40
|
indent(union([ulist_, olist_, ilist_])),
|
|
41
41
|
]),
|
|
42
42
|
ilistitem),
|
|
@@ -47,10 +47,10 @@ const list = (type: string, form: string): OListParser.ListParser => fmap(
|
|
|
47
47
|
const heads = {
|
|
48
48
|
'.': focus(
|
|
49
49
|
openers['.'],
|
|
50
|
-
({ source }) => [[source.trimEnd().split('.', 1)[0] + '.']
|
|
50
|
+
({ context: { source } }) => [[source.trimEnd().split('.', 1)[0] + '.']]),
|
|
51
51
|
'(': focus(
|
|
52
52
|
openers['('],
|
|
53
|
-
({ source }) => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')]
|
|
53
|
+
({ context: { source } }) => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')]]),
|
|
54
54
|
} as const;
|
|
55
55
|
|
|
56
56
|
function idx(value: string): number {
|
|
@@ -101,15 +101,15 @@ function style(type: string): string {
|
|
|
101
101
|
function pattern(type: string): RegExp {
|
|
102
102
|
switch (type) {
|
|
103
103
|
case 'i':
|
|
104
|
-
return
|
|
104
|
+
return /\(?i[).]?$/y;
|
|
105
105
|
case 'a':
|
|
106
|
-
return
|
|
106
|
+
return /\(?a[).]?$/y;
|
|
107
107
|
case 'I':
|
|
108
|
-
return
|
|
108
|
+
return /\(?I[).]?$/y;
|
|
109
109
|
case 'A':
|
|
110
|
-
return
|
|
110
|
+
return /\(?A[).]?$/y;
|
|
111
111
|
default:
|
|
112
|
-
return
|
|
112
|
+
return /\(?[01][).]?$/y;
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
115
|
|
|
@@ -1,29 +1,31 @@
|
|
|
1
1
|
import { pagebreak } from './pagebreak';
|
|
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/block/pagebreak', () => {
|
|
6
7
|
describe('pagebreak', () => {
|
|
7
|
-
const parser = (source: string) => some(pagebreak)(
|
|
8
|
+
const parser = (source: string) => some(pagebreak)(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('\n')), undefined);
|
|
12
|
-
assert.deepStrictEqual(inspect(parser('=')), undefined);
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('==')), undefined);
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('==\n=')), undefined);
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('===a')), undefined);
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('===\na')), undefined);
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('= = =')), undefined);
|
|
18
|
-
assert.deepStrictEqual(inspect(parser(' ===')), undefined);
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('---')), undefined);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser('\n'), ctx), undefined);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser('='), ctx), undefined);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser('=='), ctx), undefined);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser('==\n='), ctx), undefined);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('===a'), ctx), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser('===\na'), ctx), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser('= = ='), ctx), undefined);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser(' ==='), ctx), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser('---'), ctx), undefined);
|
|
20
22
|
});
|
|
21
23
|
|
|
22
24
|
it('valid', () => {
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('===')), [['<hr>'], '']);
|
|
24
|
-
assert.deepStrictEqual(inspect(parser('=== ')), [['<hr>'], '']);
|
|
25
|
-
assert.deepStrictEqual(inspect(parser('===\n')), [['<hr>'], '']);
|
|
26
|
-
assert.deepStrictEqual(inspect(parser('====')), [['<hr>'], '']);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser('==='), ctx), [['<hr>'], '']);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser('=== '), ctx), [['<hr>'], '']);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser('===\n'), ctx), [['<hr>'], '']);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser('===='), ctx), [['<hr>'], '']);
|
|
27
29
|
});
|
|
28
30
|
|
|
29
31
|
});
|
|
@@ -3,5 +3,5 @@ import { block, line, focus } from '../../combinator';
|
|
|
3
3
|
import { html } from 'typed-dom/dom';
|
|
4
4
|
|
|
5
5
|
export const pagebreak: PagebreakParser = block(line(focus(
|
|
6
|
-
|
|
7
|
-
() => [[html('hr')]
|
|
6
|
+
/={3,}[^\S\n]*(?:$|\n)/y,
|
|
7
|
+
() => [[html('hr')]])));
|
|
@@ -1,77 +1,80 @@
|
|
|
1
1
|
import { paragraph } from './paragraph';
|
|
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/block/paragraph', () => {
|
|
6
7
|
describe('paragraph', () => {
|
|
7
|
-
const parser = (source: string) => some(paragraph)(
|
|
8
|
+
const parser = (source: string) => some(paragraph)(input(source, ctx));
|
|
9
|
+
const { context: ctx } = input('', {});
|
|
8
10
|
|
|
9
11
|
it('basic', () => {
|
|
10
|
-
assert.deepStrictEqual(inspect(parser('a')), [['<p>a</p>'], '']);
|
|
11
|
-
assert.deepStrictEqual(inspect(parser('ab')), [['<p>ab</p>'], '']);
|
|
12
|
-
assert.deepStrictEqual(inspect(parser('a\\')), [['<p>a</p>'], '']);
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('a ')), [['<p>a</p>'], '']);
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('a \n')), [['<p>a</p>'], '']);
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('a\n')), [['<p>a</p>'], '']);
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('a\nb')), [['<p>a<br>b</p>'], '']);
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('a\n\\')), [['<p>a<br>\\</p>'], '']);
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('a\n\\\n')), [['<p>a<br>\\</p>'], '']);
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('a\\ ')), [['<p>a</p>'], '']);
|
|
20
|
-
assert.deepStrictEqual(inspect(parser('a\\ \n')), [['<p>a</p>'], '']);
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('a\\\n')), [['<p>a</p>'], '']);
|
|
22
|
-
assert.deepStrictEqual(inspect(parser('a\\\nb')), [['<p>a<br>b</p>'], '']);
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('a
b')), [['<p>a b</p>'], '']);
|
|
24
|
-
assert.deepStrictEqual(inspect(parser('	
')), [['<p>&Tab;&NewLine;</p>'], '']);
|
|
25
|
-
assert.deepStrictEqual(inspect(parser('<wbr>')), [['<p><wbr></p>'], '']);
|
|
26
|
-
assert.deepStrictEqual(inspect(parser('<wbr>\n')), [['<p><wbr></p>'], '']);
|
|
27
|
-
assert.deepStrictEqual(inspect(parser('<wbr>\na')), [['<p><wbr><br>a</p>'], '']);
|
|
28
|
-
assert.deepStrictEqual(inspect(parser('a\n<wbr>\n')), [['<p>a<br><wbr></p>'], '']);
|
|
29
|
-
assert.deepStrictEqual(inspect(parser('a\n<wbr>\nb')), [['<p>a<br><wbr><br>b</p>'], '']);
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('*a\n<wbr>*\nb')), [['<p>*a<br><wbr>*<br>b</p>'], '']);
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('**a\n<wbr>**\nb')), [['<p>**a<br><wbr>**<br>b</p>'], '']);
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('***a\n<wbr>***\nb')), [['<p>***a<br><wbr>***<br>b</p>'], '']);
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('***a*b\n<wbr>**\nc')), [['<p>**<em>a</em>b<br><wbr>**<br>c</p>'], '']);
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('***a**b\n<wbr>*\nc')), [['<p>*<strong>a</strong>b<br><wbr>*<br>c</p>'], '']);
|
|
35
|
-
assert.deepStrictEqual(inspect(parser('==a\n<wbr>==\nb')), [['<p>==a<br><wbr>==<br>b</p>'], '']);
|
|
36
|
-
assert.deepStrictEqual(inspect(parser('http://host)')), [['<p><a class="url" href="http://host)" target="_blank">http://host)</a></p>'], '']);
|
|
37
|
-
assert.deepStrictEqual(inspect(parser('a\nhttp://host) \nb')), [['<p>a<br><a class="url" href="http://host)" target="_blank">http://host)</a><br>b</p>'], '']);
|
|
38
|
-
assert.deepStrictEqual(inspect(parser('!http://host)')), [['<p>!<a class="url" href="http://host)" target="_blank">http://host)</a></p>'], '']);
|
|
39
|
-
assert.deepStrictEqual(inspect(parser('a\n!http://host) \nb')), [['<p>a<br>!<a class="url" href="http://host)" target="_blank">http://host)</a><br>b</p>'], '']);
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('\ta')), [['<p>\ta</p>'], '']);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser('a'), ctx), [['<p>a</p>'], '']);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser('ab'), ctx), [['<p>ab</p>'], '']);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser('a\\'), ctx), [['<p>a</p>'], '']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser('a '), ctx), [['<p>a</p>'], '']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser('a \n'), ctx), [['<p>a</p>'], '']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('a\n'), ctx), [['<p>a</p>'], '']);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser('a\nb'), ctx), [['<p>a<br>b</p>'], '']);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser('a\n\\'), ctx), [['<p>a<br>\\</p>'], '']);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser('a\n\\\n'), ctx), [['<p>a<br>\\</p>'], '']);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser('a\\ '), ctx), [['<p>a</p>'], '']);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser('a\\ \n'), ctx), [['<p>a</p>'], '']);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser('a\\\n'), ctx), [['<p>a</p>'], '']);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser('a\\\nb'), ctx), [['<p>a<br>b</p>'], '']);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser('a
b'), ctx), [['<p>a b</p>'], '']);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser('	
'), ctx), [['<p>&Tab;&NewLine;</p>'], '']);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser('<wbr>'), ctx), [['<p><wbr></p>'], '']);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser('<wbr>\n'), ctx), [['<p><wbr></p>'], '']);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser('<wbr>\na'), ctx), [['<p><wbr><br>a</p>'], '']);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser('a\n<wbr>\n'), ctx), [['<p>a<br><wbr></p>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser('a\n<wbr>\nb'), ctx), [['<p>a<br><wbr><br>b</p>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser('*a\n<wbr>*\nb'), ctx), [['<p>*a<br><wbr>*<br>b</p>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser('**a\n<wbr>**\nb'), ctx), [['<p>**a<br><wbr>**<br>b</p>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser('***a\n<wbr>***\nb'), ctx), [['<p>***a<br><wbr>***<br>b</p>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser('***a*b\n<wbr>**\nc'), ctx), [['<p>**<em>a</em>b<br><wbr>**<br>c</p>'], '']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser('***a**b\n<wbr>*\nc'), ctx), [['<p>*<strong>a</strong>b<br><wbr>*<br>c</p>'], '']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser('==a\n<wbr>==\nb'), ctx), [['<p>==a<br><wbr>==<br>b</p>'], '']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser('http://host)'), ctx), [['<p><a class="url" href="http://host)" target="_blank">http://host)</a></p>'], '']);
|
|
39
|
+
assert.deepStrictEqual(inspect(parser('a\nhttp://host) \nb'), ctx), [['<p>a<br><a class="url" href="http://host)" target="_blank">http://host)</a><br>b</p>'], '']);
|
|
40
|
+
assert.deepStrictEqual(inspect(parser('!http://host)'), ctx), [['<p>!<a class="url" href="http://host)" target="_blank">http://host)</a></p>'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser('a\n!http://host) \nb'), ctx), [['<p>a<br>!<a class="url" href="http://host)" target="_blank">http://host)</a><br>b</p>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser('\ta'), ctx), [['<p>\ta</p>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser('[[^A]]'), ctx), [['<p><sup class="reference" data-abbr="A"><span></span></sup></p>'], '']);
|
|
41
44
|
});
|
|
42
45
|
|
|
43
46
|
it('anchor', () => {
|
|
44
|
-
assert.deepStrictEqual(inspect(parser('>>1 a\nb')), [['<p><a class="anchor" href="?at=1">>>1</a> a<br>b</p>'], '']);
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('>>1 a\n>>2')), [['<p><a class="anchor" href="?at=1">>>1</a> a<br><a class="anchor" href="?at=2">>>2</a></p>'], '']);
|
|
46
|
-
assert.deepStrictEqual(inspect(parser('>>1 a\n>>b')), [['<p><a class="anchor" href="?at=1">>>1</a> a<br><a class="anchor" href="?at=b">>>b</a></p>'], '']);
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('>>1 a\n>> b')), [['<p><a class="anchor" href="?at=1">>>1</a> a<br>>> b</p>'], '']);
|
|
48
|
-
assert.deepStrictEqual(inspect(parser('>>11.')), [['<p><a class="anchor" href="?at=11">>>11</a>.</p>'], '']);
|
|
49
|
-
assert.deepStrictEqual(inspect(parser('>>11 a')), [['<p><a class="anchor" href="?at=11">>>11</a> a</p>'], '']);
|
|
50
|
-
assert.deepStrictEqual(inspect(parser('>>>11 a')), [['<p>><a class="anchor" href="?at=11">>>11</a> a</p>'], '']);
|
|
51
|
-
assert.deepStrictEqual(inspect(parser('>> a\n>>1')), [['<p>>> a<br><a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('a>>1')), [['<p>a>>1</p>'], '']);
|
|
53
|
-
assert.deepStrictEqual(inspect(parser('ab>>1')), [['<p>ab>>1</p>'], '']);
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('a >>1')), [['<p>a <a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('a\n>>1')), [['<p>a<br><a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
56
|
-
assert.deepStrictEqual(inspect(parser('a\n>>1\nb')), [['<p>a<br><a class="anchor" href="?at=1">>>1</a><br>b</p>'], '']);
|
|
57
|
-
assert.deepStrictEqual(inspect(parser('a\n>> b\nc')), [['<p>a<br>>> b<br>c</p>'], '']);
|
|
58
|
-
assert.deepStrictEqual(inspect(parser('\t>>1')), [['<p>\t<a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
59
|
-
assert.deepStrictEqual(inspect(parser('\t>>>1')), [['<p>\t><a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
60
|
-
assert.deepStrictEqual(inspect(parser('あ>>1')), [['<p>あ<a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser('>>1 a\nb'), ctx), [['<p><a class="anchor" href="?at=1">>>1</a> a<br>b</p>'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser('>>1 a\n>>2'), ctx), [['<p><a class="anchor" href="?at=1">>>1</a> a<br><a class="anchor" href="?at=2">>>2</a></p>'], '']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser('>>1 a\n>>b'), ctx), [['<p><a class="anchor" href="?at=1">>>1</a> a<br><a class="anchor" href="?at=b">>>b</a></p>'], '']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser('>>1 a\n>> b'), ctx), [['<p><a class="anchor" href="?at=1">>>1</a> a<br>>> b</p>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser('>>11.'), ctx), [['<p><a class="anchor" href="?at=11">>>11</a>.</p>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser('>>11 a'), ctx), [['<p><a class="anchor" href="?at=11">>>11</a> a</p>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser('>>>11 a'), ctx), [['<p>><a class="anchor" href="?at=11">>>11</a> a</p>'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser('>> a\n>>1'), ctx), [['<p>>> a<br><a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser('a>>1'), ctx), [['<p>a>>1</p>'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser('ab>>1'), ctx), [['<p>ab>>1</p>'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser('a >>1'), ctx), [['<p>a <a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser('a\n>>1'), ctx), [['<p>a<br><a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser('a\n>>1\nb'), ctx), [['<p>a<br><a class="anchor" href="?at=1">>>1</a><br>b</p>'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser('a\n>> b\nc'), ctx), [['<p>a<br>>> b<br>c</p>'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser('\t>>1'), ctx), [['<p>\t<a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser('\t>>>1'), ctx), [['<p>\t><a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser('あ>>1'), ctx), [['<p>あ<a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
61
64
|
});
|
|
62
65
|
|
|
63
66
|
it('remark', () => {
|
|
64
|
-
assert.deepStrictEqual(inspect(parser('[% a %]')), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span></p>'], '']);
|
|
65
|
-
assert.deepStrictEqual(inspect(parser('[% a %]b')), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span>b</p>'], '']);
|
|
66
|
-
assert.deepStrictEqual(inspect(parser('[% a %]\nb')), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span><br>b</p>'], '']);
|
|
67
|
-
assert.deepStrictEqual(inspect(parser('[%% a %%]')), [['<p><span class="remark"><input type="checkbox"><span>[%% a %%]</span></span></p>'], '']);
|
|
68
|
-
assert.deepStrictEqual(inspect(parser('[%\n<wbr>\n%]')), [['<p><span class="remark"><input type="checkbox"><span>[%<br><wbr><br>%]</span></span></p>'], '']);
|
|
69
|
-
assert.deepStrictEqual(inspect(parser('[%\n<wbr>\n%]a')), [['<p><span class="remark"><input type="checkbox"><span>[%<br><wbr><br>%]</span></span>a</p>'], '']);
|
|
70
|
-
assert.deepStrictEqual(inspect(parser('[%\n<wbr>\n%]\na')), [['<p><span class="remark"><input type="checkbox"><span>[%<br><wbr><br>%]</span></span><br>a</p>'], '']);
|
|
67
|
+
assert.deepStrictEqual(inspect(parser('[% a %]'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span></p>'], '']);
|
|
68
|
+
assert.deepStrictEqual(inspect(parser('[% a %]b'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span>b</p>'], '']);
|
|
69
|
+
assert.deepStrictEqual(inspect(parser('[% a %]\nb'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span><br>b</p>'], '']);
|
|
70
|
+
assert.deepStrictEqual(inspect(parser('[%% a %%]'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[%% a %%]</span></span></p>'], '']);
|
|
71
|
+
assert.deepStrictEqual(inspect(parser('[%\n<wbr>\n%]'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[%<br><wbr><br>%]</span></span></p>'], '']);
|
|
72
|
+
assert.deepStrictEqual(inspect(parser('[%\n<wbr>\n%]a'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[%<br><wbr><br>%]</span></span>a</p>'], '']);
|
|
73
|
+
assert.deepStrictEqual(inspect(parser('[%\n<wbr>\n%]\na'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[%<br><wbr><br>%]</span></span><br>a</p>'], '']);
|
|
71
74
|
});
|
|
72
75
|
|
|
73
76
|
it('template', () => {
|
|
74
|
-
assert.deepStrictEqual(inspect(parser('{{\n\\\n}}')), [['<p><span class="template">{{<br>\\<br>}}</span></p>'], '']);
|
|
77
|
+
assert.deepStrictEqual(inspect(parser('{{\n\\\n}}'), ctx), [['<p><span class="template">{{<br>\\<br>}}</span></p>'], '']);
|
|
75
78
|
});
|
|
76
79
|
|
|
77
80
|
});
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ParagraphParser } from '../block';
|
|
2
2
|
import { union, some, block, fmap } from '../../combinator';
|
|
3
3
|
import { inline } from '../inline';
|
|
4
|
-
import {
|
|
4
|
+
import { linearize } from '../util';
|
|
5
5
|
import { visualize, trimBlankEnd } from '../visibility';
|
|
6
6
|
import { html, defrag } from 'typed-dom/dom';
|
|
7
7
|
|
|
8
8
|
export const paragraph: ParagraphParser = block(fmap(
|
|
9
|
-
visualize(trimBlankEnd(
|
|
9
|
+
visualize(trimBlankEnd(linearize(some(union([inline])), -1))),
|
|
10
10
|
ns => [html('p', defrag(ns))]));
|