securemark 0.291.0 → 0.292.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/design.md +13 -2
- package/dist/index.js +1101 -760
- package/markdown.d.ts +17 -17
- package/package.json +1 -1
- package/src/combinator/control/constraint/block.test.ts +8 -5
- package/src/combinator/control/constraint/block.ts +9 -9
- package/src/combinator/control/constraint/contract.ts +20 -28
- package/src/combinator/control/constraint/line.test.ts +9 -6
- package/src/combinator/control/constraint/line.ts +21 -22
- package/src/combinator/control/manipulation/convert.ts +29 -13
- package/src/combinator/control/manipulation/fence.ts +18 -15
- package/src/combinator/control/manipulation/indent.test.ts +17 -14
- package/src/combinator/control/manipulation/indent.ts +21 -10
- package/src/combinator/control/manipulation/match.ts +11 -10
- package/src/combinator/control/manipulation/recovery.ts +6 -2
- package/src/combinator/control/manipulation/scope.ts +37 -38
- package/src/combinator/control/manipulation/surround.ts +78 -60
- package/src/combinator/control/manipulation/trim.test.ts +12 -9
- package/src/combinator/control/monad/bind.ts +16 -16
- package/src/combinator/control/monad/fmap.ts +6 -6
- package/src/combinator/data/parser/context/delimiter.ts +8 -7
- package/src/combinator/data/parser/context.test.ts +19 -14
- package/src/combinator/data/parser/context.ts +20 -16
- package/src/combinator/data/parser/inits.ts +13 -14
- package/src/combinator/data/parser/sequence.test.ts +16 -15
- package/src/combinator/data/parser/sequence.ts +13 -14
- package/src/combinator/data/parser/some.test.ts +19 -18
- package/src/combinator/data/parser/some.ts +13 -15
- package/src/combinator/data/parser/subsequence.test.ts +22 -21
- package/src/combinator/data/parser/subsequence.ts +3 -3
- package/src/combinator/data/parser/tails.ts +3 -3
- package/src/combinator/data/parser/union.test.ts +16 -15
- package/src/combinator/data/parser/union.ts +2 -2
- package/src/combinator/data/parser.ts +66 -28
- package/src/debug.test.ts +3 -3
- package/src/parser/api/bind.ts +3 -3
- package/src/parser/api/header.ts +7 -6
- package/src/parser/api/normalize.ts +2 -2
- package/src/parser/api/parse.test.ts +14 -15
- package/src/parser/api/parse.ts +3 -3
- package/src/parser/autolink.test.ts +19 -17
- package/src/parser/block/blockquote.test.ts +86 -84
- package/src/parser/block/blockquote.ts +4 -2
- package/src/parser/block/codeblock.test.ts +58 -56
- package/src/parser/block/codeblock.ts +3 -3
- package/src/parser/block/dlist.test.ts +58 -56
- package/src/parser/block/extension/aside.test.ts +10 -8
- package/src/parser/block/extension/aside.ts +1 -1
- package/src/parser/block/extension/example.test.ts +20 -18
- package/src/parser/block/extension/example.ts +3 -3
- package/src/parser/block/extension/fig.test.ts +38 -36
- package/src/parser/block/extension/fig.ts +1 -1
- package/src/parser/block/extension/figbase.test.ts +17 -15
- package/src/parser/block/extension/figure.test.ts +64 -62
- package/src/parser/block/extension/figure.ts +3 -2
- package/src/parser/block/extension/message.test.ts +15 -13
- package/src/parser/block/extension/message.ts +3 -3
- package/src/parser/block/extension/placeholder.test.ts +3 -1
- package/src/parser/block/extension/table.test.ts +73 -71
- package/src/parser/block/extension/table.ts +5 -5
- package/src/parser/block/extension.test.ts +3 -1
- package/src/parser/block/heading.test.ts +65 -64
- package/src/parser/block/heading.ts +3 -3
- package/src/parser/block/ilist.test.ts +3 -1
- package/src/parser/block/ilist.ts +3 -3
- package/src/parser/block/mathblock.test.ts +33 -31
- package/src/parser/block/mathblock.ts +1 -1
- package/src/parser/block/mediablock.ts +2 -2
- package/src/parser/block/olist.test.ts +99 -97
- package/src/parser/block/olist.ts +2 -2
- package/src/parser/block/pagebreak.test.ts +17 -15
- package/src/parser/block/pagebreak.ts +1 -1
- package/src/parser/block/paragraph.test.ts +60 -57
- package/src/parser/block/reply/cite.test.ts +41 -39
- package/src/parser/block/reply/cite.ts +3 -3
- package/src/parser/block/reply/quote.test.ts +52 -50
- package/src/parser/block/reply.test.ts +21 -19
- package/src/parser/block/sidefence.test.ts +51 -49
- package/src/parser/block/table.test.ts +51 -50
- package/src/parser/block/table.ts +6 -6
- package/src/parser/block/ulist.test.ts +52 -50
- package/src/parser/block/ulist.ts +2 -2
- package/src/parser/block.ts +6 -5
- package/src/parser/context.ts +1 -0
- package/src/parser/header.test.ts +22 -21
- package/src/parser/header.ts +25 -13
- package/src/parser/inline/annotation.test.ts +44 -42
- package/src/parser/inline/annotation.ts +2 -2
- package/src/parser/inline/autolink/account.test.ts +32 -30
- package/src/parser/inline/autolink/account.ts +1 -1
- package/src/parser/inline/autolink/anchor.test.ts +23 -21
- package/src/parser/inline/autolink/anchor.ts +1 -1
- package/src/parser/inline/autolink/channel.test.ts +16 -14
- package/src/parser/inline/autolink/channel.ts +2 -2
- package/src/parser/inline/autolink/email.test.ts +38 -36
- package/src/parser/inline/autolink/email.ts +2 -2
- package/src/parser/inline/autolink/hashnum.test.ts +39 -37
- package/src/parser/inline/autolink/hashnum.ts +1 -1
- package/src/parser/inline/autolink/hashtag.test.ts +58 -56
- package/src/parser/inline/autolink/hashtag.ts +1 -1
- package/src/parser/inline/autolink/url.test.ts +76 -74
- package/src/parser/inline/autolink/url.ts +6 -6
- package/src/parser/inline/bracket.test.ts +69 -67
- package/src/parser/inline/bracket.ts +32 -32
- package/src/parser/inline/code.test.ts +32 -29
- package/src/parser/inline/code.ts +20 -13
- package/src/parser/inline/deletion.test.ts +29 -27
- package/src/parser/inline/deletion.ts +2 -2
- package/src/parser/inline/emphasis.test.ts +40 -36
- package/src/parser/inline/emphasis.ts +2 -2
- package/src/parser/inline/emstrong.test.ts +102 -96
- package/src/parser/inline/emstrong.ts +96 -36
- package/src/parser/inline/extension/index.test.ts +91 -89
- package/src/parser/inline/extension/index.ts +18 -30
- package/src/parser/inline/extension/indexee.ts +1 -1
- package/src/parser/inline/extension/indexer.test.ts +26 -24
- package/src/parser/inline/extension/indexer.ts +1 -1
- package/src/parser/inline/extension/label.test.ts +34 -32
- package/src/parser/inline/extension/placeholder.test.ts +44 -42
- package/src/parser/inline/extension/placeholder.ts +11 -8
- package/src/parser/inline/html.test.ts +108 -106
- package/src/parser/inline/html.ts +24 -23
- package/src/parser/inline/htmlentity.test.ts +39 -37
- package/src/parser/inline/htmlentity.ts +9 -3
- package/src/parser/inline/insertion.test.ts +29 -27
- package/src/parser/inline/insertion.ts +2 -2
- package/src/parser/inline/italic.test.ts +55 -53
- package/src/parser/inline/italic.ts +2 -2
- package/src/parser/inline/link.test.ts +187 -185
- package/src/parser/inline/link.ts +30 -12
- package/src/parser/inline/mark.test.ts +31 -29
- package/src/parser/inline/mark.ts +3 -3
- package/src/parser/inline/math.test.ts +133 -131
- package/src/parser/inline/math.ts +2 -2
- package/src/parser/inline/media.test.ts +93 -91
- package/src/parser/inline/media.ts +41 -17
- package/src/parser/inline/reference.test.ts +110 -108
- package/src/parser/inline/reference.ts +49 -40
- package/src/parser/inline/remark.test.ts +53 -51
- package/src/parser/inline/remark.ts +3 -3
- package/src/parser/inline/ruby.test.ts +46 -44
- package/src/parser/inline/ruby.ts +29 -32
- package/src/parser/inline/shortmedia.test.ts +11 -9
- package/src/parser/inline/strong.test.ts +37 -33
- package/src/parser/inline/strong.ts +6 -3
- package/src/parser/inline/template.test.ts +24 -22
- package/src/parser/inline/template.ts +20 -11
- package/src/parser/inline.test.ts +221 -220
- package/src/parser/inline.ts +13 -8
- package/src/parser/segment.ts +13 -8
- package/src/parser/source/escapable.test.ts +24 -22
- package/src/parser/source/escapable.ts +26 -41
- package/src/parser/source/line.test.ts +19 -17
- package/src/parser/source/line.ts +3 -3
- package/src/parser/source/str.ts +28 -11
- package/src/parser/source/text.test.ts +85 -83
- package/src/parser/source/text.ts +26 -54
- package/src/parser/source/unescapable.test.ts +24 -22
- package/src/parser/source/unescapable.ts +18 -33
- package/src/parser/source.ts +1 -1
- package/src/parser/util.ts +36 -33
- package/src/parser/visibility.ts +19 -15
- package/src/util/quote.ts +4 -2
|
@@ -1,70 +1,71 @@
|
|
|
1
1
|
import { table } from './table';
|
|
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/table', () => {
|
|
6
7
|
describe('table', () => {
|
|
7
|
-
const parser = (source: string) => some(table)(
|
|
8
|
+
const parser = (source: string) => some(table)(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('|||')), undefined);
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('|\n|')), undefined);
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('|h')), undefined);
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('|h')), undefined);
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('|h\n')), undefined);
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('|h\n|')), undefined);
|
|
20
|
-
assert.deepStrictEqual(inspect(parser('|h\n|b')), undefined);
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('|h\n|-\nb')), undefined);
|
|
22
|
-
assert.deepStrictEqual(inspect(parser('|h\n|-\n |b')), undefined);
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('|h\n |-\n|b')), undefined);
|
|
24
|
-
assert.deepStrictEqual(inspect(parser(' |h\n|-\n|b')), 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('|||'), ctx), undefined);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('|\n|'), ctx), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser('|h'), ctx), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser('|h'), ctx), undefined);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser('|h\n'), ctx), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser('|h\n|'), ctx), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser('|h\n|b'), ctx), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser('|h\n|-\nb'), ctx), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser('|h\n|-\n |b'), ctx), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser('|h\n |-\n|b'), ctx), undefined);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser(' |h\n|-\n|b'), ctx), undefined);
|
|
25
27
|
});
|
|
26
28
|
|
|
27
29
|
it('valid', () => {
|
|
28
|
-
assert.deepStrictEqual(inspect(parser('|\n|\n|')), [['<table><thead><tr></tr></thead><tbody><tr class="invalid"><td>|</td></tr><tr></tr></tbody></table>'], '']);
|
|
29
|
-
assert.deepStrictEqual(inspect(parser('|\n|-\n|')), [['<table><thead><tr></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('||\n|-|\n||')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('|||\n|-|-|\n|||')), [['<table><thead><tr><th></th><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('|"|\n|-\n|')), [['<table><thead><tr><th>"</th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('
|
|
35
|
-
assert.deepStrictEqual(inspect(parser('
|
|
36
|
-
assert.deepStrictEqual(inspect(parser('
|
|
37
|
-
assert.deepStrictEqual(inspect(parser('|a|b
|
|
38
|
-
assert.deepStrictEqual(inspect(parser('|a
|
|
39
|
-
assert.deepStrictEqual(inspect(parser('|a
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('
|
|
41
|
-
assert.deepStrictEqual(inspect(parser('||\n|-\n
|
|
42
|
-
assert.deepStrictEqual(inspect(parser('||\n|-\n||\\')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
43
|
-
assert.deepStrictEqual(inspect(parser('||\n|-\n
|
|
44
|
-
assert.deepStrictEqual(inspect(parser('||\n|-\n||\\\n')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('
|
|
46
|
-
assert.deepStrictEqual(inspect(parser('|| \n
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('|| \n|-| \n|| ')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser('|\n|\n|'), ctx), [['<table><thead><tr></tr></thead><tbody><tr class="invalid"><td>|</td></tr><tr></tr></tbody></table>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser('|\n|-\n|'), ctx), [['<table><thead><tr></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser('||\n|-|\n||'), ctx), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser('|||\n|-|-|\n|||'), ctx), [['<table><thead><tr><th></th><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser('|"|\n|-\n|'), ctx), [['<table><thead><tr><th>"</th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser('|`|`|\n|-\n|'), ctx), [['<table><thead><tr><th><code data-src="`|`">|</code></th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser('|((|\n|-\n|'), ctx), [['<table><thead><tr><th>((</th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser('|${|\n|-\n|'), ctx), [['<table><thead><tr><th>${</th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser('|a|b|\n|-|-|\n|1|2|'), ctx), [['<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('|a|b\n|-|-\n|1|2'), ctx), [['<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('|a|\n|-|\n|1|'), ctx), [['<table><thead><tr><th>a</th></tr></thead><tbody><tr><td>1</td></tr></tbody></table>'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser('|a\n|-\n|1'), ctx), [['<table><thead><tr><th>a</th></tr></thead><tbody><tr><td>1</td></tr></tbody></table>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser('||\n|-\n||'), ctx), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser('||\n|-\n||\\'), ctx), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser('||\n|-\n||\\ '), ctx), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser('||\n|-\n||\\\n'), ctx), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser('||\n|-\n||\\\n||'), ctx), [['<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('|| \n|- \n|| '), ctx), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser('|| \n|-| \n|| '), ctx), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
48
49
|
});
|
|
49
50
|
|
|
50
51
|
it('align', () => {
|
|
51
|
-
assert.deepStrictEqual(inspect(parser('|h|\n|:-|\n|b|')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="start">b</td></tr></tbody></table>'], '']);
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('|h|\n|-:|\n|b|')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="end">b</td></tr></tbody></table>'], '']);
|
|
53
|
-
assert.deepStrictEqual(inspect(parser('|h|\n|:-:|\n|b|')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="center">b</td></tr></tbody></table>'], '']);
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|-|\n|b|b|')), [['<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>'], '']);
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|:-|\n|b|b|')), [['<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('|h|h|\n|:-|:-:|\n|b|b|')), [['<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>'], '']);
|
|
57
|
-
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|-:|\n|b|b|')), [['<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>'], '']);
|
|
58
|
-
assert.deepStrictEqual(inspect(parser('|h|h|h|\n|:-:|:-|-:|\n|b|b|b|')), [['<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>'], '']);
|
|
59
|
-
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|\n|b|b|')), [['<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>'], '']);
|
|
60
|
-
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|-|\n|b|b|')), [['<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>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser('|h|\n|:-|\n|b|'), ctx), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="start">b</td></tr></tbody></table>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser('|h|\n|-:|\n|b|'), ctx), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="end">b</td></tr></tbody></table>'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser('|h|\n|:-:|\n|b|'), ctx), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="center">b</td></tr></tbody></table>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser('|h|h|\n|:-|-|\n|b|b|'), ctx), [['<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('|h|h|\n|:-|:-|\n|b|b|'), ctx), [['<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('|h|h|\n|:-|:-:|\n|b|b|'), ctx), [['<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('|h|h|\n|:-|-:|\n|b|b|'), ctx), [['<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('|h|h|h|\n|:-:|:-|-:|\n|b|b|b|'), ctx), [['<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('|h|h|\n|:-|\n|b|b|'), ctx), [['<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('|h|h|\n|:-|-|\n|b|b|'), ctx), [['<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
62
|
});
|
|
62
63
|
|
|
63
64
|
it('trim', () => {
|
|
64
|
-
assert.deepStrictEqual(inspect(parser('| h \n|- \n| b ')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
65
|
-
assert.deepStrictEqual(inspect(parser('| h | \n|- \n| b | ')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
66
|
-
assert.deepStrictEqual(inspect(parser('|\\ h \\\n|- \n|\\ b \\')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
67
|
-
assert.deepStrictEqual(inspect(parser('|\\ h \\ \n|- \n|\\ b \\ | ')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
65
|
+
assert.deepStrictEqual(inspect(parser('| h \n|- \n| b '), ctx), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
66
|
+
assert.deepStrictEqual(inspect(parser('| h | \n|- \n| b | '), ctx), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
67
|
+
assert.deepStrictEqual(inspect(parser('|\\ h \\\n|- \n|\\ b \\'), ctx), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
68
|
+
assert.deepStrictEqual(inspect(parser('|\\ h \\ \n|- \n|\\ b \\ | '), ctx), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
68
69
|
});
|
|
69
70
|
|
|
70
71
|
});
|
|
@@ -29,20 +29,20 @@ export const table: TableParser = lazy(() => block(fmap(validate(
|
|
|
29
29
|
const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean): RowParser<P> => fallback(fmap(
|
|
30
30
|
line(surround(/^(?=\|)/, some(union([parser])), /^[|\\]?\s*$/, optional)),
|
|
31
31
|
es => [html('tr', es)]),
|
|
32
|
-
rewrite(contentline, ({ source }) => [[
|
|
32
|
+
rewrite(contentline, ({ context: { source } }) => [[
|
|
33
33
|
html('tr', {
|
|
34
34
|
class: 'invalid',
|
|
35
35
|
...invalid('table-row', 'syntax', 'Missing the start symbol of the table row'),
|
|
36
36
|
}, [html('td', source.replace('\n', ''))])
|
|
37
|
-
]
|
|
37
|
+
]]));
|
|
38
38
|
|
|
39
39
|
const align: AlignParser = fmap(open(
|
|
40
40
|
'|',
|
|
41
41
|
union([
|
|
42
|
-
focus(/^:-+:?/, ({ source }) =>
|
|
43
|
-
[[source
|
|
44
|
-
focus(/^-+:?/, ({ source }) =>
|
|
45
|
-
[[source
|
|
42
|
+
focus(/^:-+:?/, ({ context: { source } }) =>
|
|
43
|
+
[[source.at(-1) === ':' ? 'center' : 'start']], false),
|
|
44
|
+
focus(/^-+:?/, ({ context: { source } }) =>
|
|
45
|
+
[[source.at(-1) === ':' ? 'end' : '']], false),
|
|
46
46
|
])),
|
|
47
47
|
ns => [html('td', defrag(ns))]);
|
|
48
48
|
|
|
@@ -1,81 +1,83 @@
|
|
|
1
1
|
import { ulist } from './ulist';
|
|
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/ulist', () => {
|
|
6
7
|
describe('ulist', () => {
|
|
7
|
-
const parser = (source: string) => some(ulist)(
|
|
8
|
+
const parser = (source: string) => some(ulist)(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('-0')), undefined);
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('-a')), undefined);
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('-[]')), undefined);
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('-[ ]')), undefined);
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('-[x]')), undefined);
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('-\n')), undefined);
|
|
20
|
-
assert.deepStrictEqual(inspect(parser(' - ')), undefined);
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('+')), undefined);
|
|
22
|
-
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('-0'), ctx), undefined);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('-a'), ctx), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser('-[]'), ctx), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser('-[ ]'), ctx), undefined);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser('-[x]'), ctx), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser('-\n'), ctx), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser(' - '), ctx), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser('+'), ctx), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser('*'), ctx), undefined);
|
|
23
25
|
});
|
|
24
26
|
|
|
25
27
|
it('single', () => {
|
|
26
28
|
// pending
|
|
27
|
-
assert.deepStrictEqual(inspect(parser('- ')), [['<ul><li></li></ul>'], '']);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser('- '), ctx), [['<ul><li></li></ul>'], '']);
|
|
28
30
|
// filled
|
|
29
|
-
assert.deepStrictEqual(inspect(parser('- \\')), [['<ul><li id="index::\\">\\</li></ul>'], '']);
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('- \\\n')), [['<ul><li id="index::\\">\\</li></ul>'], '']);
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('- -')), [['<ul><li id="index::-">-</li></ul>'], '']);
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('- -\n')), [['<ul><li id="index::-">-</li></ul>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser('- \\'), ctx), [['<ul><li id="index::\\">\\</li></ul>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser('- \\\n'), ctx), [['<ul><li id="index::\\">\\</li></ul>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser('- -'), ctx), [['<ul><li id="index::-">-</li></ul>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser('- -\n'), ctx), [['<ul><li id="index::-">-</li></ul>'], '']);
|
|
33
35
|
});
|
|
34
36
|
|
|
35
37
|
it('multiple', () => {
|
|
36
38
|
// pending
|
|
37
|
-
assert.deepStrictEqual(inspect(parser('-\n-')), [['<ul><li></li><li></li></ul>'], '']);
|
|
39
|
+
assert.deepStrictEqual(inspect(parser('-\n-'), ctx), [['<ul><li></li><li></li></ul>'], '']);
|
|
38
40
|
// filled
|
|
39
|
-
assert.deepStrictEqual(inspect(parser('- 1\n- 2')), [['<ul><li id="index::1">1</li><li id="index::2">2</li></ul>'], '']);
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('- 1\n- 2\n- 3')), [['<ul><li id="index::1">1</li><li id="index::2">2</li><li id="index::3">3</li></ul>'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser('- 1\n- 2'), ctx), [['<ul><li id="index::1">1</li><li id="index::2">2</li></ul>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser('- 1\n- 2\n- 3'), ctx), [['<ul><li id="index::1">1</li><li id="index::2">2</li><li id="index::3">3</li></ul>'], '']);
|
|
41
43
|
// invalid
|
|
42
|
-
assert.deepStrictEqual(inspect(parser('-\n+')), [['<ul><li></li><li id="index::+"><span class="invalid">+</span></li></ul>'], '']);
|
|
43
|
-
assert.deepStrictEqual(inspect(parser('-\n0')), [['<ul><li></li><li id="index::0"><span class="invalid">0</span></li></ul>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser('-\n+'), ctx), [['<ul><li></li><li id="index::+"><span class="invalid">+</span></li></ul>'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser('-\n0'), ctx), [['<ul><li></li><li id="index::0"><span class="invalid">0</span></li></ul>'], '']);
|
|
44
46
|
});
|
|
45
47
|
|
|
46
48
|
it('nest', () => {
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('-\n -')), [['<ul><li><br><ul><li></li></ul></li></ul>'], '']);
|
|
48
|
-
assert.deepStrictEqual(inspect(parser('- 1\n - 2')), [['<ul><li id="index::1">1<ul><li id="index::2">2</li></ul></li></ul>'], '']);
|
|
49
|
-
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n- 3')), [['<ul><li id="index::1">1<ul><li id="index::2">2</li></ul></li><li id="index::3">3</li></ul>'], '']);
|
|
50
|
-
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n - 3')), [['<ul><li id="index::1">1<ul><li id="index::2">2</li><li id="index::3">3</li></ul></li></ul>'], '']);
|
|
51
|
-
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n - 3')), [['<ul><li id="index::1">1<ul><li id="index::2">2<ul><li id="index::3">3</li></ul></li></ul></li></ul>'], '']);
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n - 3')), [['<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>'], '']);
|
|
53
|
-
assert.deepStrictEqual(inspect(parser('-\n -\n +\n -\n +\n+')), [['<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>'], '']);
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('- 1\n + 2')), [['<ul><li id="index::1">1<ul class="invalid"><li>2</li></ul></li></ul>'], '']);
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('- 1\n 0')), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
56
|
-
assert.deepStrictEqual(inspect(parser('- 1\n 0.')), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
57
|
-
assert.deepStrictEqual(inspect(parser('- 1\n 0. ')), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
58
|
-
assert.deepStrictEqual(inspect(parser('- 1\n 0. 2')), [['<ul><li id="index::1">1<ol><li id="index::2">2</li></ol></li></ul>'], '']);
|
|
59
|
-
assert.deepStrictEqual(inspect(parser('- a [#b]')), [['<ul><li id="index::a_b">a <a class="index" href="#index::b">b</a></li></ul>'], '']);
|
|
60
|
-
assert.deepStrictEqual(inspect(parser('- http://host\\')), [['<ul><li id="index::http://host\\"><a class="url" href="http://host\\" target="_blank">http://host\\</a></li></ul>'], '']);
|
|
61
|
-
assert.deepStrictEqual(inspect(parser('- !http://host')), [['<ul><li id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></li></ul>'], '']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser('-\n -'), ctx), [['<ul><li><br><ul><li></li></ul></li></ul>'], '']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser('- 1\n - 2'), ctx), [['<ul><li id="index::1">1<ul><li id="index::2">2</li></ul></li></ul>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n- 3'), ctx), [['<ul><li id="index::1">1<ul><li id="index::2">2</li></ul></li><li id="index::3">3</li></ul>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n - 3'), ctx), [['<ul><li id="index::1">1<ul><li id="index::2">2</li><li id="index::3">3</li></ul></li></ul>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n - 3'), ctx), [['<ul><li id="index::1">1<ul><li id="index::2">2<ul><li id="index::3">3</li></ul></li></ul></li></ul>'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser('- 1\n - 2\n - 3'), ctx), [['<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>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser('-\n -\n +\n -\n +\n+'), ctx), [['<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>'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser('- 1\n + 2'), ctx), [['<ul><li id="index::1">1<ul class="invalid"><li>2</li></ul></li></ul>'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser('- 1\n 0'), ctx), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser('- 1\n 0.'), ctx), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser('- 1\n 0. '), ctx), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser('- 1\n 0. 2'), ctx), [['<ul><li id="index::1">1<ol><li id="index::2">2</li></ol></li></ul>'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser('- a [#b]'), ctx), [['<ul><li id="index::a_b">a <a class="index" href="#index::b">b</a></li></ul>'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser('- http://host\\'), ctx), [['<ul><li id="index::http://host\\"><a class="url" href="http://host\\" target="_blank">http://host\\</a></li></ul>'], '']);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser('- !http://host'), ctx), [['<ul><li id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></li></ul>'], '']);
|
|
62
64
|
});
|
|
63
65
|
|
|
64
66
|
it('checkbox', () => {
|
|
65
|
-
assert.deepStrictEqual(inspect(parser('- [ ]')), [['<ul class="checklist"><li><span class="checkbox">☐</span></li></ul>'], '']);
|
|
66
|
-
assert.deepStrictEqual(inspect(parser('- [x]')), [['<ul class="checklist"><li><span class="checkbox">☑</span></li></ul>'], '']);
|
|
67
|
-
assert.deepStrictEqual(inspect(parser('- [X]')), [['<ul class="checklist"><li><span class="checkbox">☑</span></li></ul>'], '']);
|
|
68
|
-
assert.deepStrictEqual(inspect(parser('- [X] 1')), [['<ul class="checklist"><li id="index::1"><span class="checkbox">☑</span>1</li></ul>'], '']);
|
|
67
|
+
assert.deepStrictEqual(inspect(parser('- [ ]'), ctx), [['<ul class="checklist"><li><span class="checkbox">☐</span></li></ul>'], '']);
|
|
68
|
+
assert.deepStrictEqual(inspect(parser('- [x]'), ctx), [['<ul class="checklist"><li><span class="checkbox">☑</span></li></ul>'], '']);
|
|
69
|
+
assert.deepStrictEqual(inspect(parser('- [X]'), ctx), [['<ul class="checklist"><li><span class="checkbox">☑</span></li></ul>'], '']);
|
|
70
|
+
assert.deepStrictEqual(inspect(parser('- [X] 1'), ctx), [['<ul class="checklist"><li id="index::1"><span class="checkbox">☑</span>1</li></ul>'], '']);
|
|
69
71
|
});
|
|
70
72
|
|
|
71
73
|
it('indexer', () => {
|
|
72
|
-
assert.deepStrictEqual(inspect(parser('- [|a]')), [['<ul><li id="index::[|a]">[|a]</li></ul>'], '']);
|
|
73
|
-
assert.deepStrictEqual(inspect(parser('- a [|]')), [['<ul><li>a<span class="indexer" data-index=""></span></li></ul>'], '']);
|
|
74
|
-
assert.deepStrictEqual(inspect(parser('- a [|b]')), [['<ul><li id="index::b">a<span class="indexer" data-index="b"></span></li></ul>'], '']);
|
|
75
|
-
assert.deepStrictEqual(inspect(parser('- [ ] [|a]')), [['<ul class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span>[|a]</li></ul>'], '']);
|
|
76
|
-
assert.deepStrictEqual(inspect(parser('- [ ] a [|b]')), [['<ul class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ul>'], '']);
|
|
77
|
-
assert.deepStrictEqual(inspect(parser('- a [|]\n - c [|d]')), [['<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>'], '']);
|
|
78
|
-
assert.deepStrictEqual(inspect(parser('- a [|b]\n - c [|d]')), [['<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>'], '']);
|
|
74
|
+
assert.deepStrictEqual(inspect(parser('- [|a]'), ctx), [['<ul><li id="index::[|a]">[|a]</li></ul>'], '']);
|
|
75
|
+
assert.deepStrictEqual(inspect(parser('- a [|]'), ctx), [['<ul><li>a<span class="indexer" data-index=""></span></li></ul>'], '']);
|
|
76
|
+
assert.deepStrictEqual(inspect(parser('- a [|b]'), ctx), [['<ul><li id="index::b">a<span class="indexer" data-index="b"></span></li></ul>'], '']);
|
|
77
|
+
assert.deepStrictEqual(inspect(parser('- [ ] [|a]'), ctx), [['<ul class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span>[|a]</li></ul>'], '']);
|
|
78
|
+
assert.deepStrictEqual(inspect(parser('- [ ] a [|b]'), ctx), [['<ul class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ul>'], '']);
|
|
79
|
+
assert.deepStrictEqual(inspect(parser('- a [|]\n - c [|d]'), ctx), [['<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>'], '']);
|
|
80
|
+
assert.deepStrictEqual(inspect(parser('- a [|b]\n - c [|d]'), ctx), [['<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>'], '']);
|
|
79
81
|
});
|
|
80
82
|
|
|
81
83
|
});
|
|
@@ -31,9 +31,9 @@ export const ulist_: UListParser = lazy(() => block(fmap(validate(
|
|
|
31
31
|
|
|
32
32
|
export const checkbox = focus(
|
|
33
33
|
/^\[[xX ]\](?=$|\s)/,
|
|
34
|
-
({ source }) => [[
|
|
34
|
+
({ context: { source } }) => [[
|
|
35
35
|
html('span', { class: 'checkbox' }, source[1].trimStart() ? '☑' : '☐'),
|
|
36
|
-
]
|
|
36
|
+
]]);
|
|
37
37
|
|
|
38
38
|
export function fillFirstLine(ns: (HTMLElement | string)[]): (HTMLElement | string)[] {
|
|
39
39
|
return ns.length === 1
|
package/src/parser/block.ts
CHANGED
|
@@ -42,7 +42,7 @@ export const block: BlockParser = reset(
|
|
|
42
42
|
{
|
|
43
43
|
resources: {
|
|
44
44
|
// バックトラックのせいで文字数制限を受けないようにする。
|
|
45
|
-
clock: MAX_SEGMENT_SIZE *
|
|
45
|
+
clock: MAX_SEGMENT_SIZE * 1,
|
|
46
46
|
recursions: [
|
|
47
47
|
10 || Recursion.block,
|
|
48
48
|
20 || Recursion.blockquote,
|
|
@@ -52,6 +52,7 @@ export const block: BlockParser = reset(
|
|
|
52
52
|
20 || Recursion.terminal,
|
|
53
53
|
],
|
|
54
54
|
},
|
|
55
|
+
backtracks: {},
|
|
55
56
|
},
|
|
56
57
|
error(union([
|
|
57
58
|
emptyline,
|
|
@@ -75,9 +76,9 @@ export const block: BlockParser = reset(
|
|
|
75
76
|
function error(parser: BlockParser): BlockParser {
|
|
76
77
|
const reg = new RegExp(String.raw`^${Command.Error}.*\n`)
|
|
77
78
|
return recover<BlockParser>(fallback(
|
|
78
|
-
open(Command.Error, ({ source }) => { throw new Error(source.split('\n', 1)[0]); }),
|
|
79
|
+
open(Command.Error, ({ context: { source, position } }) => { throw new Error(source.slice(position).split('\n', 1)[0]); }),
|
|
79
80
|
parser),
|
|
80
|
-
({
|
|
81
|
+
({ context: { source, position, id } }, reason) => [[
|
|
81
82
|
html('h1',
|
|
82
83
|
{
|
|
83
84
|
id: id !== '' ? `error:${rnd0Z(8)}` : undefined,
|
|
@@ -91,9 +92,9 @@ function error(parser: BlockParser): BlockParser {
|
|
|
91
92
|
class: 'error',
|
|
92
93
|
translate: 'no',
|
|
93
94
|
},
|
|
94
|
-
source
|
|
95
|
+
source.slice(position)
|
|
95
96
|
.replace(reg, '')
|
|
96
97
|
.slice(0, 1001)
|
|
97
98
|
.replace(/^(.{997}).{4}$/s, '$1...') || undefined),
|
|
98
|
-
]
|
|
99
|
+
]]);
|
|
99
100
|
}
|
package/src/parser/context.ts
CHANGED
|
@@ -1,34 +1,35 @@
|
|
|
1
1
|
import { header } from './header';
|
|
2
|
-
import {
|
|
2
|
+
import { input } from '../combinator/data/parser';
|
|
3
3
|
import { inspect } from '../debug.test';
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/header', () => {
|
|
6
6
|
describe('header', () => {
|
|
7
|
-
const parser = (source: string) =>
|
|
7
|
+
const parser = (source: string) => header(input(source, ctx));
|
|
8
|
+
const { context: ctx } = input('', {});
|
|
8
9
|
|
|
9
10
|
it('invalid', () => {
|
|
10
|
-
assert.deepStrictEqual(inspect(parser('')), undefined);
|
|
11
|
-
assert.deepStrictEqual(inspect(parser('---')), undefined);
|
|
12
|
-
assert.deepStrictEqual(inspect(parser('---\n')), undefined);
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('---\n---')), [['<pre class="invalid" translate="no">---\n---</pre>'], '']);
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\n')), [['<pre class="invalid" translate="no">---\na: b\n</pre>'], '']);
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\n---c')), [['<pre class="invalid" translate="no">---\na: b\n---c</pre>'], '']);
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\n---\nc')), undefined);
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('---\r \na: b\n---')), undefined);
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('---\na:\rb\n---')), [['<pre class="invalid" translate="no">---\na:\nb\n---</pre>'], '']);
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\r \n---')), [['<pre class="invalid" translate="no">---\na: b\n \n---</pre>'], '']);
|
|
20
|
-
assert.deepStrictEqual(inspect(parser('---\n\n---')), undefined);
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('---\n \n---')), undefined);
|
|
22
|
-
assert.deepStrictEqual(inspect(parser('---\n-\n---')), [['<pre class="invalid" translate="no">---\n-\n---</pre>'], '']);
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('----\na: b\n----')), [['<pre class="invalid" translate="no">----\na: b\n----</pre>'], '']);
|
|
24
|
-
assert.deepStrictEqual(inspect(parser(`---\n${'a: b\n'.repeat(101)}---`)), [[`<pre class="invalid" translate="no">---\n${'a: b\n'.repeat(101)}---</pre>`], '']);
|
|
11
|
+
assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser('---'), ctx), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser('---\n'), ctx), undefined);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser('---\n---'), ctx), [['<pre class="invalid" translate="no">---\n---</pre>'], '']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser('---\na: b\n'), ctx), [['<pre class="invalid" translate="no">---\na: b\n</pre>'], '']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser('---\na: b\n---c'), ctx), [['<pre class="invalid" translate="no">---\na: b\n---c</pre>'], '']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('---\na: b\n---\nc'), ctx), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser('---\r \na: b\n---'), ctx), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser('---\na:\rb\n---'), ctx), [['<pre class="invalid" translate="no">---\na:\nb\n---</pre>'], '']);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser('---\na: b\r \n---'), ctx), [['<pre class="invalid" translate="no">---\na: b\n \n---</pre>'], '']);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser('---\n\n---'), ctx), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser('---\n \n---'), ctx), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser('---\n-\n---'), ctx), [['<pre class="invalid" translate="no">---\n-\n---</pre>'], '']);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser('----\na: b\n----'), ctx), [['<pre class="invalid" translate="no">----\na: b\n----</pre>'], '']);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser(`---\n${'a: b\n'.repeat(101)}---`), ctx), [[`<pre class="invalid" translate="no">---\n${'a: b\n'.repeat(101)}---</pre>`], '']);
|
|
25
26
|
});
|
|
26
27
|
|
|
27
28
|
it('basic', () => {
|
|
28
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\n---')), [['<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>'], '']);
|
|
29
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\n---\n')), [['<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>'], '']);
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('---\na: b\nC: D e\n---\n')), [['<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>'], '']);
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('--- \r\na: b \r\n--- \r\n \r\n \r\na')), [['<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']);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser('---\na: b\n---'), ctx), [['<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>'], '']);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser('---\na: b\n---\n'), ctx), [['<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('---\na: b\nC: D e\n---\n'), ctx), [['<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>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser('--- \r\na: b \r\n--- \r\n \r\n \r\na'), ctx), [['<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']);
|
|
32
33
|
});
|
|
33
34
|
|
|
34
35
|
});
|
package/src/parser/header.ts
CHANGED
|
@@ -10,8 +10,16 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
|
|
|
10
10
|
/^---+[^\S\v\f\r\n]*\r?\n[^\S\n]*(?=\S)/,
|
|
11
11
|
inits([
|
|
12
12
|
rewrite(
|
|
13
|
-
({
|
|
14
|
-
|
|
13
|
+
({ context }) => {
|
|
14
|
+
const { source } = context;
|
|
15
|
+
if (context.header ?? true) {
|
|
16
|
+
context.position += segment(source).next().value!.length;
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
context.position = source.length;
|
|
20
|
+
}
|
|
21
|
+
return [[]];
|
|
22
|
+
},
|
|
15
23
|
block(
|
|
16
24
|
union([
|
|
17
25
|
validate(({ context }) => context.header ?? true,
|
|
@@ -28,20 +36,24 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
|
|
|
28
36
|
])),
|
|
29
37
|
]),
|
|
30
38
|
]), false))),
|
|
31
|
-
({
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
39
|
+
({ context }) => {
|
|
40
|
+
const { source, position } = context;
|
|
41
|
+
context.position += source.length;
|
|
42
|
+
return [[
|
|
43
|
+
html('pre', {
|
|
44
|
+
class: 'invalid',
|
|
45
|
+
translate: 'no',
|
|
46
|
+
...invalid('header', 'syntax', 'Invalid syntax'),
|
|
47
|
+
}, normalize(source.slice(position))),
|
|
48
|
+
]];
|
|
49
|
+
},
|
|
38
50
|
]))),
|
|
39
51
|
clear(str(/^[^\S\v\f\r\n]*\r?\n/)),
|
|
40
52
|
])));
|
|
41
53
|
|
|
42
|
-
const field: MarkdownParser.HeaderParser.FieldParser = line(({ source }) => {
|
|
43
|
-
const name = source.slice(
|
|
44
|
-
const value = source.slice(name.length + 1).trim();
|
|
54
|
+
const field: MarkdownParser.HeaderParser.FieldParser = line(({ context: { source, position } }) => {
|
|
55
|
+
const name = source.slice(position, source.indexOf(':', position));
|
|
56
|
+
const value = source.slice(position + name.length + 1).trim();
|
|
45
57
|
return [[
|
|
46
58
|
html('span', { class: 'field', 'data-name': name.toLowerCase(), 'data-value': value }, [
|
|
47
59
|
html('span', { class: 'field-name' }, name),
|
|
@@ -49,5 +61,5 @@ const field: MarkdownParser.HeaderParser.FieldParser = line(({ source }) => {
|
|
|
49
61
|
html('span', { class: 'field-value' }, value),
|
|
50
62
|
'\n',
|
|
51
63
|
]),
|
|
52
|
-
]
|
|
64
|
+
]];
|
|
53
65
|
});
|