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,71 +1,71 @@
|
|
|
1
1
|
import { table } from './table';
|
|
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/block/table', () => {
|
|
7
8
|
describe('table', () => {
|
|
8
|
-
const parser =
|
|
9
|
-
const { context: ctx } = input('', {});
|
|
9
|
+
const parser = some(table);
|
|
10
10
|
|
|
11
11
|
it('invalid', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser(''
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('\n'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('|'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('||'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('|||'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('|\n|'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('|h'
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('|h'
|
|
20
|
-
assert.deepStrictEqual(inspect(parser('|h\n'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('|h\n|'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser('|h\n|b'
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('|h\n|-\nb'
|
|
24
|
-
assert.deepStrictEqual(inspect(parser('|h\n|-\n |b'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser('|h\n |-\n|b'
|
|
26
|
-
assert.deepStrictEqual(inspect(parser(' |h\n|-\n|b'
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('\n', new Context())), undefined);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('|', new Context())), undefined);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('||', new Context())), undefined);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('|||', new Context())), undefined);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('|\n|', new Context())), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input('|h', new Context())), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('|h', new Context())), undefined);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n', new Context())), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n|', new Context())), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n|b', new Context())), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n|-\nb', new Context())), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n|-\n |b', new Context())), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n |-\n|b', new Context())), undefined);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input(' |h\n|-\n|b', new Context())), undefined);
|
|
27
27
|
});
|
|
28
28
|
|
|
29
29
|
it('valid', () => {
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('|\n|\n|'
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('|\n|-\n|'
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('||\n|-|\n||'
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('|||\n|-|-|\n|||'
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('|"|\n|-\n|'
|
|
35
|
-
assert.deepStrictEqual(inspect(parser('|`|`|\n|-\n|'
|
|
36
|
-
assert.deepStrictEqual(inspect(parser('|((|\n|-\n|'
|
|
37
|
-
assert.deepStrictEqual(inspect(parser('|${|\n|-\n|'
|
|
38
|
-
assert.deepStrictEqual(inspect(parser('|a|b|\n|-|-|\n|1|2|'
|
|
39
|
-
assert.deepStrictEqual(inspect(parser('|a|b\n|-|-\n|1|2'
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('|a|\n|-|\n|1|'
|
|
41
|
-
assert.deepStrictEqual(inspect(parser('|a\n|-\n|1'
|
|
42
|
-
assert.deepStrictEqual(inspect(parser('||\n|-\n||'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser('||\n|-\n||\\'
|
|
44
|
-
assert.deepStrictEqual(inspect(parser('||\n|-\n||\\ '
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('||\n|-\n||\\\n'
|
|
46
|
-
assert.deepStrictEqual(inspect(parser('||\n|-\n||\\\n||'
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('|| \n|- \n|| '
|
|
48
|
-
assert.deepStrictEqual(inspect(parser('|| \n|-| \n|| '
|
|
30
|
+
assert.deepStrictEqual(inspect(parser, input('|\n|\n|', new Context())), [['<table><thead><tr></tr></thead><tbody><tr class="invalid"><td>|</td></tr><tr></tr></tbody></table>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser, input('|\n|-\n|', new Context())), [['<table><thead><tr></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-|\n||', new Context())), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser, input('|||\n|-|-|\n|||', new Context())), [['<table><thead><tr><th></th><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('|"|\n|-\n|', new Context())), [['<table><thead><tr><th>"</th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('|`|`|\n|-\n|', new Context())), [['<table><thead><tr><th><code data-src="`|`">|</code></th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser, input('|((|\n|-\n|', new Context())), [['<table><thead><tr><th>((</th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser, input('|${|\n|-\n|', new Context())), [['<table><thead><tr><th>${</th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser, input('|a|b|\n|-|-|\n|1|2|', new Context())), [['<table><thead><tr><th>a</th><th>b</th></tr></thead><tbody><tr><td>1</td><td>2</td></tr></tbody></table>'], '']);
|
|
39
|
+
assert.deepStrictEqual(inspect(parser, input('|a|b\n|-|-\n|1|2', new Context())), [['<table><thead><tr><th>a</th><th>b</th></tr></thead><tbody><tr><td>1</td><td>2</td></tr></tbody></table>'], '']);
|
|
40
|
+
assert.deepStrictEqual(inspect(parser, input('|a|\n|-|\n|1|', new Context())), [['<table><thead><tr><th>a</th></tr></thead><tbody><tr><td>1</td></tr></tbody></table>'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser, input('|a\n|-\n|1', new Context())), [['<table><thead><tr><th>a</th></tr></thead><tbody><tr><td>1</td></tr></tbody></table>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||', new Context())), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\', new Context())), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\ ', new Context())), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\\n', new Context())), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\\n||', new Context())), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr><tr><td></td></tr></tbody></table>'], '']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser, input('|| \n|- \n|| ', new Context())), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser, input('|| \n|-| \n|| ', new Context())), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
49
49
|
});
|
|
50
50
|
|
|
51
51
|
it('align', () => {
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('|h|\n|:-|\n|b|'
|
|
53
|
-
assert.deepStrictEqual(inspect(parser('|h|\n|-:|\n|b|'
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('|h|\n|:-:|\n|b|'
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|-|\n|b|b|'
|
|
56
|
-
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|:-|\n|b|b|'
|
|
57
|
-
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|:-:|\n|b|b|'
|
|
58
|
-
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|-:|\n|b|b|'
|
|
59
|
-
assert.deepStrictEqual(inspect(parser('|h|h|h|\n|:-:|:-|-:|\n|b|b|b|'
|
|
60
|
-
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|\n|b|b|'
|
|
61
|
-
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|-|\n|b|b|'
|
|
52
|
+
assert.deepStrictEqual(inspect(parser, input('|h|\n|:-|\n|b|', new Context())), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="start">b</td></tr></tbody></table>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser, input('|h|\n|-:|\n|b|', new Context())), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="end">b</td></tr></tbody></table>'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser, input('|h|\n|:-:|\n|b|', new Context())), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="center">b</td></tr></tbody></table>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|-|\n|b|b|', new Context())), [['<table><thead><tr><th>h</th><th>h</th></tr></thead><tbody><tr><td align="start">b</td><td align="start">b</td></tr></tbody></table>'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|:-|\n|b|b|', new Context())), [['<table><thead><tr><th>h</th><th>h</th></tr></thead><tbody><tr><td align="start">b</td><td align="start">b</td></tr></tbody></table>'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|:-:|\n|b|b|', new Context())), [['<table><thead><tr><th>h</th><th>h</th></tr></thead><tbody><tr><td align="start">b</td><td align="center">b</td></tr></tbody></table>'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|-:|\n|b|b|', new Context())), [['<table><thead><tr><th>h</th><th>h</th></tr></thead><tbody><tr><td align="start">b</td><td align="end">b</td></tr></tbody></table>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser, input('|h|h|h|\n|:-:|:-|-:|\n|b|b|b|', new Context())), [['<table><thead><tr><th>h</th><th>h</th><th>h</th></tr></thead><tbody><tr><td align="center">b</td><td align="start">b</td><td align="end">b</td></tr></tbody></table>'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|\n|b|b|', new Context())), [['<table><thead><tr><th>h</th><th>h</th></tr></thead><tbody><tr><td align="start">b</td><td align="start">b</td></tr></tbody></table>'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|-|\n|b|b|', new Context())), [['<table><thead><tr><th>h</th><th>h</th></tr></thead><tbody><tr><td align="start">b</td><td align="start">b</td></tr></tbody></table>'], '']);
|
|
62
62
|
});
|
|
63
63
|
|
|
64
64
|
it('trim', () => {
|
|
65
|
-
assert.deepStrictEqual(inspect(parser('| h \n|- \n| b '
|
|
66
|
-
assert.deepStrictEqual(inspect(parser('| h | \n|- \n| b | '
|
|
67
|
-
assert.deepStrictEqual(inspect(parser('|\\ h \\\n|- \n|\\ b \\'
|
|
68
|
-
assert.deepStrictEqual(inspect(parser('|\\ h \\ \n|- \n|\\ b \\ | '
|
|
65
|
+
assert.deepStrictEqual(inspect(parser, input('| h \n|- \n| b ', new Context())), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
66
|
+
assert.deepStrictEqual(inspect(parser, input('| h | \n|- \n| b | ', new Context())), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
67
|
+
assert.deepStrictEqual(inspect(parser, input('|\\ h \\\n|- \n|\\ b \\', new Context())), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
68
|
+
assert.deepStrictEqual(inspect(parser, input('|\\ h \\ \n|- \n|\\ b \\ | ', new Context())), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
69
69
|
});
|
|
70
70
|
|
|
71
71
|
});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TableParser } from '../block';
|
|
2
|
-
import { List,
|
|
2
|
+
import { List, Node } from '../../combinator/data/parser';
|
|
3
3
|
import { union, sequence, some, block, line, validate, focus, rewrite, surround, open, close, fallback, lazy, fmap } from '../../combinator';
|
|
4
4
|
import { inline, media, medialink, shortmedia } from '../inline';
|
|
5
5
|
import { contentline } from '../source';
|
|
@@ -21,7 +21,7 @@ export const table: TableParser = lazy(() => block(fmap(validate(
|
|
|
21
21
|
some(row(some(data), true)),
|
|
22
22
|
])),
|
|
23
23
|
rows => new List([
|
|
24
|
-
new
|
|
24
|
+
new Node(html('table', [
|
|
25
25
|
html('thead', [rows.shift()!.value]),
|
|
26
26
|
html('tbody', unwrap(format(rows))),
|
|
27
27
|
])),
|
|
@@ -29,9 +29,9 @@ export const table: TableParser = lazy(() => block(fmap(validate(
|
|
|
29
29
|
|
|
30
30
|
const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean): RowParser<P> => fallback(fmap(
|
|
31
31
|
line(surround(/(?=\|)/y, some(union([parser])), /\|?\s*$/y, optional)),
|
|
32
|
-
ns => new List([new
|
|
32
|
+
ns => new List([new Node(html('tr', unwrap(ns)))])),
|
|
33
33
|
rewrite(contentline, ({ context: { source } }) => new List([
|
|
34
|
-
new
|
|
34
|
+
new Node(html('tr', {
|
|
35
35
|
class: 'invalid',
|
|
36
36
|
...invalid('table-row', 'syntax', 'Missing the start symbol of the table row'),
|
|
37
37
|
}, [html('td', source.replace('\n', ''))]))
|
|
@@ -40,12 +40,12 @@ const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean):
|
|
|
40
40
|
const align: AlignParser = fmap(open(
|
|
41
41
|
'|',
|
|
42
42
|
union([
|
|
43
|
-
focus(/:-+:?/y, ({ context: { source, position, range
|
|
44
|
-
new List([new
|
|
45
|
-
focus(/-+:?/y, ({ context: { source, position, range
|
|
46
|
-
new List([new
|
|
43
|
+
focus(/:-+:?/y, ({ context: { source, position, range } }) =>
|
|
44
|
+
new List([new Node(source[position + range - 1] === ':' ? 'center' : 'start')]), false),
|
|
45
|
+
focus(/-+:?/y, ({ context: { source, position, range } }) =>
|
|
46
|
+
new List([new Node(source[position + range - 1] === ':' ? 'end' : '')]), false),
|
|
47
47
|
])),
|
|
48
|
-
ns => new List([new
|
|
48
|
+
ns => new List([new Node(html('td', defrag(unwrap(ns))))]));
|
|
49
49
|
|
|
50
50
|
const cell: CellParser = surround(
|
|
51
51
|
/\|\s*(?=\S)/y,
|
|
@@ -59,13 +59,13 @@ const cell: CellParser = surround(
|
|
|
59
59
|
|
|
60
60
|
const head: CellParser.HeadParser = fmap(
|
|
61
61
|
cell,
|
|
62
|
-
ns => new List([new
|
|
62
|
+
ns => new List([new Node(html('th', defrag(unwrap(ns))))]));
|
|
63
63
|
|
|
64
64
|
const data: CellParser.DataParser = fmap(
|
|
65
65
|
cell,
|
|
66
|
-
ns => new List([new
|
|
66
|
+
ns => new List([new Node(html('td', defrag(unwrap(ns))))]));
|
|
67
67
|
|
|
68
|
-
function format(rows: List<
|
|
68
|
+
function format(rows: List<Node<HTMLTableRowElement>>): List<Node<HTMLTableRowElement>> {
|
|
69
69
|
const aligns = rows.head!.value.className === 'invalid'
|
|
70
70
|
? []
|
|
71
71
|
: duffReduce(rows.shift()!.value.children, (acc, el) => push(acc, [el.textContent!]), [] as string[]);
|
|
@@ -1,85 +1,85 @@
|
|
|
1
1
|
import { ulist } from './ulist';
|
|
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/block/ulist', () => {
|
|
7
8
|
describe('ulist', () => {
|
|
8
|
-
const parser =
|
|
9
|
-
const { context: ctx } = input('', {});
|
|
9
|
+
const parser = some(ulist);
|
|
10
10
|
|
|
11
11
|
it('invalid', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser(''
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('\n'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('-'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('--'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('-0'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('-a'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('-[]'
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('-[ ]'
|
|
20
|
-
assert.deepStrictEqual(inspect(parser('-[x]'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('-\n'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser('-\n- a'
|
|
23
|
-
assert.deepStrictEqual(inspect(parser(' - '
|
|
24
|
-
assert.deepStrictEqual(inspect(parser('+'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser('*'
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('\n', new Context())), undefined);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('-', new Context())), undefined);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('--', new Context())), undefined);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('-0', new Context())), undefined);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('-a', new Context())), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input('-[]', new Context())), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('-[ ]', new Context())), undefined);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser, input('-[x]', new Context())), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('-\n', new Context())), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('-\n- a', new Context())), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input(' - ', new Context())), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('+', new Context())), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('*', new Context())), undefined);
|
|
26
26
|
});
|
|
27
27
|
|
|
28
28
|
it('single', () => {
|
|
29
29
|
// pending
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('- '
|
|
30
|
+
assert.deepStrictEqual(inspect(parser, input('- ', new Context())), [['<ul><li></li></ul>'], '']);
|
|
31
31
|
// filled
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('- \\'
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('- \\\n'
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('- -'
|
|
35
|
-
assert.deepStrictEqual(inspect(parser('- -\n'
|
|
32
|
+
assert.deepStrictEqual(inspect(parser, input('- \\', new Context())), [['<ul><li id="index::\\">\\</li></ul>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser, input('- \\\n', new Context())), [['<ul><li id="index::\\">\\</li></ul>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('- -', new Context())), [['<ul><li id="index::-">-</li></ul>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('- -\n', new Context())), [['<ul><li id="index::-">-</li></ul>'], '']);
|
|
36
36
|
});
|
|
37
37
|
|
|
38
38
|
it('multiple', () => {
|
|
39
39
|
// pending
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('- \n-'
|
|
40
|
+
assert.deepStrictEqual(inspect(parser, input('- \n-', new Context())), [['<ul><li></li><li></li></ul>'], '']);
|
|
41
41
|
// filled
|
|
42
|
-
assert.deepStrictEqual(inspect(parser('- 1\n- 2'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser('- 1\n- 2\n- 3'
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n- 2', new Context())), [['<ul><li id="index::1">1</li><li id="index::2">2</li></ul>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n- 2\n- 3', new Context())), [['<ul><li id="index::1">1</li><li id="index::2">2</li><li id="index::3">3</li></ul>'], '']);
|
|
44
44
|
// invalid
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('- \n+'
|
|
46
|
-
assert.deepStrictEqual(inspect(parser('- \n0'
|
|
45
|
+
assert.deepStrictEqual(inspect(parser, input('- \n+', new Context())), [['<ul><li></li><li id="index::+"><span class="invalid">+</span></li></ul>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser, input('- \n0', new Context())), [['<ul><li></li><li id="index::0"><span class="invalid">0</span></li></ul>'], '']);
|
|
47
47
|
});
|
|
48
48
|
|
|
49
49
|
it('nest', () => {
|
|
50
|
-
assert.deepStrictEqual(inspect(parser('- \n -'
|
|
51
|
-
assert.deepStrictEqual(inspect(parser('- 1\n - 2'
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n- 3'
|
|
53
|
-
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n - 3'
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n - 3'
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n - 3'
|
|
56
|
-
assert.deepStrictEqual(inspect(parser('- \n -\n +\n -\n +\n+'
|
|
57
|
-
assert.deepStrictEqual(inspect(parser('- 1\n + 2'
|
|
58
|
-
assert.deepStrictEqual(inspect(parser('- 1\n 0'
|
|
59
|
-
assert.deepStrictEqual(inspect(parser('- 1\n 0.'
|
|
60
|
-
assert.deepStrictEqual(inspect(parser('- 1\n 0. '
|
|
61
|
-
assert.deepStrictEqual(inspect(parser('- 1\n 0. 2'
|
|
62
|
-
assert.deepStrictEqual(inspect(parser('- a [#b]'
|
|
63
|
-
assert.deepStrictEqual(inspect(parser('- http://host\\'
|
|
64
|
-
assert.deepStrictEqual(inspect(parser('- !http://host'
|
|
50
|
+
assert.deepStrictEqual(inspect(parser, input('- \n -', new Context())), [['<ul><li><br><ul><li></li></ul></li></ul>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n - 2', new Context())), [['<ul><li id="index::1">1<ul><li id="index::2">2</li></ul></li></ul>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n - 2\n- 3', new Context())), [['<ul><li id="index::1">1<ul><li id="index::2">2</li></ul></li><li id="index::3">3</li></ul>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n - 2\n - 3', new Context())), [['<ul><li id="index::1">1<ul><li id="index::2">2</li><li id="index::3">3</li></ul></li></ul>'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n - 2\n - 3', new Context())), [['<ul><li id="index::1">1<ul><li id="index::2">2<ul><li id="index::3">3</li></ul></li></ul></li></ul>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n - 2\n - 3', new Context())), [['<ul><li id="index::1">1<ul><li id="index::2">2</li></ul></li><li id="index::-_3"><span class="invalid"> - 3</span></li></ul>'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser, input('- \n -\n +\n -\n +\n+', new Context())), [['<ul><li><br><ul><li></li><li id="index::+"><span class="invalid">+</span></li><li></li><li id="index::+"><span class="invalid">+</span></li></ul></li><li id="index::+"><span class="invalid">+</span></li></ul>'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n + 2', new Context())), [['<ul><li id="index::1">1<ul class="invalid"><li>2</li></ul></li></ul>'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n 0', new Context())), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n 0.', new Context())), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n 0. ', new Context())), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n 0. 2', new Context())), [['<ul><li id="index::1">1<ol><li id="index::2">2</li></ol></li></ul>'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser, input('- a [#b]', new Context())), [['<ul><li id="index::a_b">a <a class="index" href="#index::b">b</a></li></ul>'], '']);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser, input('- http://host\\', new Context())), [['<ul><li id="index::http://host\\"><a class="url" href="http://host\\" target="_blank">http://host\\</a></li></ul>'], '']);
|
|
64
|
+
assert.deepStrictEqual(inspect(parser, input('- !http://host', new Context())), [['<ul><li id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></li></ul>'], '']);
|
|
65
65
|
});
|
|
66
66
|
|
|
67
67
|
it('checkbox', () => {
|
|
68
|
-
assert.deepStrictEqual(inspect(parser('- [ ]'
|
|
69
|
-
assert.deepStrictEqual(inspect(parser('- [x]'
|
|
70
|
-
assert.deepStrictEqual(inspect(parser('- [X]'
|
|
71
|
-
assert.deepStrictEqual(inspect(parser('- [X] 1'
|
|
68
|
+
assert.deepStrictEqual(inspect(parser, input('- [ ]', new Context())), [['<ul class="checklist"><li><span class="checkbox">☐</span></li></ul>'], '']);
|
|
69
|
+
assert.deepStrictEqual(inspect(parser, input('- [x]', new Context())), [['<ul class="checklist"><li><span class="checkbox">☑</span></li></ul>'], '']);
|
|
70
|
+
assert.deepStrictEqual(inspect(parser, input('- [X]', new Context())), [['<ul class="checklist"><li><span class="checkbox">☑</span></li></ul>'], '']);
|
|
71
|
+
assert.deepStrictEqual(inspect(parser, input('- [X] 1', new Context())), [['<ul class="checklist"><li id="index::1"><span class="checkbox">☑</span>1</li></ul>'], '']);
|
|
72
72
|
});
|
|
73
73
|
|
|
74
74
|
it('indexer', () => {
|
|
75
|
-
assert.deepStrictEqual(inspect(parser('- [|a]'
|
|
76
|
-
assert.deepStrictEqual(inspect(parser('- a [|]'
|
|
77
|
-
assert.deepStrictEqual(inspect(parser('- a [|b]'
|
|
78
|
-
assert.deepStrictEqual(inspect(parser('- - [|b]'
|
|
79
|
-
assert.deepStrictEqual(inspect(parser('- [ ] [|a]'
|
|
80
|
-
assert.deepStrictEqual(inspect(parser('- [ ] a [|b]'
|
|
81
|
-
assert.deepStrictEqual(inspect(parser('- a [|]\n - c [|d]'
|
|
82
|
-
assert.deepStrictEqual(inspect(parser('- a [|b]\n - c [|d]'
|
|
75
|
+
assert.deepStrictEqual(inspect(parser, input('- [|a]', new Context())), [['<ul><li id="index::[|a]"><span class="invalid">[|a]</span></li></ul>'], '']);
|
|
76
|
+
assert.deepStrictEqual(inspect(parser, input('- a [|]', new Context())), [['<ul><li>a<span class="indexer" data-index=""></span></li></ul>'], '']);
|
|
77
|
+
assert.deepStrictEqual(inspect(parser, input('- a [|b]', new Context())), [['<ul><li id="index::b">a<span class="indexer" data-index="b"></span></li></ul>'], '']);
|
|
78
|
+
assert.deepStrictEqual(inspect(parser, input('- - [|b]', new Context())), [['<ul><li id="index::b">-<span class="indexer" data-index="b"></span></li></ul>'], '']);
|
|
79
|
+
assert.deepStrictEqual(inspect(parser, input('- [ ] [|a]', new Context())), [['<ul class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span><span class="invalid">[|a]</span></li></ul>'], '']);
|
|
80
|
+
assert.deepStrictEqual(inspect(parser, input('- [ ] a [|b]', new Context())), [['<ul class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ul>'], '']);
|
|
81
|
+
assert.deepStrictEqual(inspect(parser, input('- a [|]\n - c [|d]', new Context())), [['<ul><li>a<span class="indexer" data-index=""></span><ul><li id="index::d">c<span class="indexer" data-index="d"></span></li></ul></li></ul>'], '']);
|
|
82
|
+
assert.deepStrictEqual(inspect(parser, input('- a [|b]\n - c [|d]', new Context())), [['<ul><li id="index::b">a<span class="indexer" data-index="b"></span><ul><li id="index::d">c<span class="indexer" data-index="d"></span></li></ul></li></ul>'], '']);
|
|
83
83
|
});
|
|
84
84
|
|
|
85
85
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { UListParser } from '../block';
|
|
2
2
|
import { Recursion } from '../context';
|
|
3
|
-
import { List,
|
|
3
|
+
import { List, Node } from '../../combinator/data/parser';
|
|
4
4
|
import { union, inits, subsequence, some, recursion, block, line, validate, indent, focus, open, fallback, lazy, fmap } from '../../combinator';
|
|
5
5
|
import { olist_ } from './olist';
|
|
6
6
|
import { ilist_, ilistitem } from './ilist';
|
|
@@ -25,23 +25,23 @@ export const ulist_: UListParser = lazy(() => block(fmap(validate(
|
|
|
25
25
|
indent(union([ulist_, olist_, ilist_])),
|
|
26
26
|
]),
|
|
27
27
|
ilistitem),
|
|
28
|
-
ns => new List([new
|
|
28
|
+
ns => new List([new Node(html('li', { 'data-index': dataindex(ns) }, defrag(unwrap(fillFirstLine(ns)))))]))),
|
|
29
29
|
])))),
|
|
30
|
-
ns => new List([new
|
|
30
|
+
ns => new List([new Node(format(html('ul', unwrap(ns))))]))));
|
|
31
31
|
|
|
32
32
|
export const checkbox = focus(
|
|
33
33
|
/\[[xX ]\](?=$|[ \n])/y,
|
|
34
34
|
({ context: { source, position } }) => new List([
|
|
35
|
-
new
|
|
35
|
+
new Node(html('span', { class: 'checkbox' }, source[position + 1].trimStart() ? '☑' : '☐')),
|
|
36
36
|
]), false);
|
|
37
37
|
|
|
38
|
-
export function fillFirstLine(nodes: List<
|
|
38
|
+
export function fillFirstLine(nodes: List<Node<string | HTMLElement>>): List<Node<string | HTMLElement>> {
|
|
39
39
|
const node = nodes.head?.value;
|
|
40
40
|
if (typeof node !== 'object') return nodes;
|
|
41
41
|
switch (node.tagName) {
|
|
42
42
|
case 'UL':
|
|
43
43
|
case 'OL':
|
|
44
|
-
nodes.unshift(new
|
|
44
|
+
nodes.unshift(new Node(html('br')));
|
|
45
45
|
}
|
|
46
46
|
return nodes;
|
|
47
47
|
}
|
package/src/parser/block.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { MarkdownParser } from '../../markdown';
|
|
2
2
|
import { Recursion, Command } from './context';
|
|
3
|
-
import { List,
|
|
3
|
+
import { List, Node } from '../combinator/data/parser';
|
|
4
4
|
import { union, reset, open, fallback, recover } from '../combinator';
|
|
5
5
|
import { MAX_SEGMENT_SIZE } from './segment';
|
|
6
|
+
import { header } from './header';
|
|
6
7
|
import { emptyline } from './source';
|
|
7
8
|
import { pagebreak } from './block/pagebreak';
|
|
8
9
|
import { heading } from './block/heading';
|
|
@@ -43,7 +44,7 @@ export const block: BlockParser = reset(
|
|
|
43
44
|
{
|
|
44
45
|
resources: {
|
|
45
46
|
// バックトラックのせいで文字数制限を受けないようにする。
|
|
46
|
-
clock: MAX_SEGMENT_SIZE *
|
|
47
|
+
clock: MAX_SEGMENT_SIZE * 6 + 1,
|
|
47
48
|
recursions: [
|
|
48
49
|
10 || Recursion.block,
|
|
49
50
|
20 || Recursion.blockquote,
|
|
@@ -73,6 +74,7 @@ export const block: BlockParser = reset(
|
|
|
73
74
|
if (source[position + 1] === ' ') return dlist(input);
|
|
74
75
|
break;
|
|
75
76
|
case '-':
|
|
77
|
+
if (source.startsWith('---', position)) return header(input);
|
|
76
78
|
if (source[position + 1] === ' ') return ulist(input) || ilist(input);
|
|
77
79
|
break;
|
|
78
80
|
case '+':
|
|
@@ -115,7 +117,7 @@ function error(parser: BlockParser): BlockParser {
|
|
|
115
117
|
open(Command.Error, ({ context: { source, position } }) => { throw new Error(source.slice(position).split('\n', 1)[0]); }),
|
|
116
118
|
parser),
|
|
117
119
|
({ context: { source, position, id } }, reason) => new List([
|
|
118
|
-
new
|
|
120
|
+
new Node(html('h1',
|
|
119
121
|
{
|
|
120
122
|
id: id !== '' ? `error:${rnd0Z(8)}` : undefined,
|
|
121
123
|
class: 'error',
|
|
@@ -123,7 +125,7 @@ function error(parser: BlockParser): BlockParser {
|
|
|
123
125
|
reason instanceof Error
|
|
124
126
|
? `${reason.name}: ${reason.message}`
|
|
125
127
|
: `UnknownError: ${reason}`)),
|
|
126
|
-
new
|
|
128
|
+
new Node(html('pre',
|
|
127
129
|
{
|
|
128
130
|
class: 'error',
|
|
129
131
|
translate: 'no',
|
package/src/parser/context.ts
CHANGED
|
@@ -1,3 +1,42 @@
|
|
|
1
|
+
import { List, Node, Context as Ctx } from '../../src/combinator/data/parser';
|
|
2
|
+
import { Dict } from 'spica/dict';
|
|
3
|
+
|
|
4
|
+
export class Context extends Ctx {
|
|
5
|
+
constructor(
|
|
6
|
+
options: Partial<Context> = {},
|
|
7
|
+
) {
|
|
8
|
+
super(options);
|
|
9
|
+
const {
|
|
10
|
+
buffer,
|
|
11
|
+
sequential,
|
|
12
|
+
header,
|
|
13
|
+
host,
|
|
14
|
+
url,
|
|
15
|
+
id,
|
|
16
|
+
caches,
|
|
17
|
+
} = options;
|
|
18
|
+
this.buffer = buffer ?? new List();
|
|
19
|
+
this.sequential = sequential ?? false;
|
|
20
|
+
this.header = header;
|
|
21
|
+
this.host = host;
|
|
22
|
+
this.url = url;
|
|
23
|
+
this.id = id;
|
|
24
|
+
this.caches = caches;
|
|
25
|
+
}
|
|
26
|
+
public buffer: List<Node<(string | HTMLElement)>>;
|
|
27
|
+
public sequential: boolean;
|
|
28
|
+
public readonly header?: boolean;
|
|
29
|
+
public readonly host?: URL;
|
|
30
|
+
public readonly url?: URL;
|
|
31
|
+
public readonly id?: string;
|
|
32
|
+
public readonly caches?: {
|
|
33
|
+
readonly code?: Dict<string, HTMLElement>;
|
|
34
|
+
readonly math?: Dict<string, HTMLElement>;
|
|
35
|
+
readonly media?: Dict<string, HTMLElement>;
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
export type Options = Partial<Context>;
|
|
39
|
+
|
|
1
40
|
export const enum State {
|
|
2
41
|
annotation = 1 << 7,
|
|
3
42
|
reference = 1 << 6,
|
|
@@ -1,37 +1,37 @@
|
|
|
1
1
|
import { header } from './header';
|
|
2
2
|
import { input } from '../combinator/data/parser';
|
|
3
|
+
import { Context } from './context';
|
|
3
4
|
import { inspect } from '../debug.test';
|
|
4
5
|
|
|
5
6
|
describe('Unit: parser/header', () => {
|
|
6
7
|
describe('header', () => {
|
|
7
|
-
const parser =
|
|
8
|
-
const { context: ctx } = input('', {});
|
|
8
|
+
const parser = header;
|
|
9
9
|
|
|
10
10
|
it('invalid', () => {
|
|
11
|
-
assert.deepStrictEqual(inspect(parser(''
|
|
12
|
-
assert.deepStrictEqual(inspect(parser('---'
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('---\n'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('---\n---'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\n'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\n---c'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\n---\nc'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('---\r \na: b\n---'
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('---\na:\rb\n---'
|
|
20
|
-
//assert.deepStrictEqual(inspect(parser('---\na: b\r \n---'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('---\n\n---'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser('---\n \n---'
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('---\n-\n---'
|
|
24
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\n----'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser('----\na: b\n---'
|
|
26
|
-
assert.deepStrictEqual(inspect(parser(`---\n${'a: b\n'.repeat(101)}
|
|
11
|
+
assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('---', new Context())), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('---\n', new Context())), undefined);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('---\n---', new Context())), [['<pre class="invalid" translate="no">---\n---</pre>'], '']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('---\na: b\n', new Context())), [['<pre class="invalid" translate="no">---\na: b\n</pre>'], '']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('---\na: b\n---c', new Context())), [['<pre class="invalid" translate="no">---\na: b\n---c</pre>'], '']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('---\na: b\n---\nc', new Context())), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input('---\r \na: b\n---', new Context())), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('---\na:\rb\n---', new Context())), [['<pre class="invalid" translate="no">---\na:\nb\n---</pre>'], '']);
|
|
20
|
+
//assert.deepStrictEqual(inspect(parser, input('---\na: b\r \n---', new Context())), [['<pre class="invalid" translate="no">---\na: b\n \n---</pre>'], '']);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('---\n\n---', new Context())), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('---\n \n---', new Context())), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('---\n-\n---', new Context())), [['<pre class="invalid" translate="no">---\n-\n---</pre>'], '']);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('---\na: b\n----', new Context())), [['<pre class="invalid" translate="no">---\na: b\n----</pre>'], '']);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('----\na: b\n---', new Context())), [['<pre class="invalid" translate="no">----\na: b\n---</pre>'], '']);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input(`---\n${'a: b\n'.repeat(101)}---`, new Context())), [[`<pre class="invalid" translate="no">---\n${'a: b\n'.repeat(101)}---</pre>`], '']);
|
|
27
27
|
});
|
|
28
28
|
|
|
29
29
|
it('basic', () => {
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\n---'
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\n---\n'
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\nC: D e\n---\n'
|
|
33
|
-
//assert.deepStrictEqual(inspect(parser('--- \r\na: b \r\n--- \r\n \r\n \r\na'
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('----\na: b\n----'
|
|
30
|
+
assert.deepStrictEqual(inspect(parser, input('---\na: b\n---', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser, input('---\na: b\n---\n', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser, input('---\na: b\nC: D e\n---\n', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span><span class="field" data-name="c" data-value="D e"><span class="field-name">C</span>: <span class="field-value">D e</span>\n</span></details></aside>'], '']);
|
|
33
|
+
//assert.deepStrictEqual(inspect(parser, input('--- \r\na: b \r\n--- \r\n \r\n \r\na', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], ' \r\na']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('----\na: b\n----', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], '']);
|
|
35
35
|
});
|
|
36
36
|
|
|
37
37
|
});
|