securemark 0.299.4 → 0.300.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/design.md +0 -6
- package/dist/index.js +2749 -1979
- package/index.d.ts +2 -1
- package/markdown.d.ts +209 -183
- package/package.json +1 -1
- package/src/api/bind.test.ts +0 -22
- package/src/api/bind.ts +15 -10
- package/src/api/header.ts +8 -5
- package/src/api/parse.test.ts +118 -122
- package/src/api/parse.ts +13 -31
- package/src/api/run.ts +6 -0
- package/src/api.ts +1 -0
- package/src/combinator/control/inits.ts +26 -0
- package/src/combinator/control/sequence.test.ts +38 -0
- package/src/combinator/control/sequence.ts +17 -0
- package/src/combinator/control/some.test.ts +41 -0
- package/src/combinator/{data/parser → control}/some.ts +39 -26
- package/src/combinator/control/state.ts +42 -0
- package/src/combinator/control/subsequence.test.ts +47 -0
- package/src/combinator/control/subsequence.ts +16 -0
- package/src/combinator/control/tails.ts +8 -0
- package/src/combinator/control/union.test.ts +37 -0
- package/src/combinator/control/union.ts +18 -0
- package/src/combinator/{data/delimiter.ts → delimiter.ts} +40 -60
- package/src/combinator/effect/backtrack.ts +64 -0
- package/src/combinator/effect/clock.ts +10 -0
- package/src/combinator/effect/precedence.ts +50 -0
- package/src/combinator/effect/recursion.ts +30 -0
- package/src/combinator/effect/scope.ts +100 -0
- package/src/combinator/effect/state.ts +72 -0
- package/src/combinator/{data/list → parser}/list.ts +35 -10
- package/src/combinator/parser.ts +293 -0
- package/src/combinator/process/bind.ts +34 -0
- package/src/combinator/process/block.test.ts +20 -0
- package/src/combinator/process/block.ts +33 -0
- package/src/combinator/process/clear.ts +16 -0
- package/src/combinator/process/contract.ts +35 -0
- package/src/combinator/process/duplicate.ts +7 -0
- package/src/combinator/process/error.ts +13 -0
- package/src/combinator/{control/manipulation → process}/fallback.ts +3 -3
- package/src/combinator/process/fence.ts +59 -0
- package/src/combinator/process/fmap.ts +10 -0
- package/src/combinator/process/indent.test.ts +31 -0
- package/src/combinator/process/indent.ts +51 -0
- package/src/combinator/process/lazy.ts +8 -0
- package/src/combinator/process/line.test.ts +21 -0
- package/src/combinator/process/line.ts +55 -0
- package/src/combinator/process/match.ts +37 -0
- package/src/combinator/process/reverse.ts +7 -0
- package/src/combinator/process/scope.ts +102 -0
- package/src/combinator/process/surround.ts +271 -0
- package/src/combinator.ts +28 -24
- package/src/debug.test.ts +11 -8
- package/src/parser/autolink.test.ts +17 -18
- package/src/parser/block/blockquote.test.ts +78 -79
- package/src/parser/block/blockquote.ts +32 -25
- package/src/parser/block/codeblock.test.ts +56 -57
- package/src/parser/block/codeblock.ts +44 -26
- package/src/parser/block/dlist.test.ts +56 -57
- package/src/parser/block/dlist.ts +5 -5
- package/src/parser/block/extension/aside.test.ts +8 -9
- package/src/parser/block/extension/aside.ts +76 -47
- package/src/parser/block/extension/example.test.ts +18 -19
- package/src/parser/block/extension/example.ts +88 -48
- package/src/parser/block/extension/fig.test.ts +37 -36
- package/src/parser/block/extension/fig.ts +20 -25
- package/src/parser/block/extension/figbase.test.ts +18 -19
- package/src/parser/block/extension/figbase.ts +3 -3
- package/src/parser/block/extension/figure.test.ts +62 -63
- package/src/parser/block/extension/figure.ts +23 -21
- package/src/parser/block/extension/message.test.ts +13 -14
- package/src/parser/block/extension/message.ts +52 -39
- package/src/parser/block/extension/placeholder.test.ts +13 -13
- package/src/parser/block/extension/placeholder.ts +23 -21
- package/src/parser/block/extension/table.test.ts +70 -71
- package/src/parser/block/extension/table.ts +43 -31
- package/src/parser/block/extension.test.ts +24 -24
- package/src/parser/block/extension.ts +3 -3
- package/src/parser/block/heading.test.ts +58 -59
- package/src/parser/block/heading.ts +19 -18
- package/src/parser/block/ilist.test.ts +8 -8
- package/src/parser/block/ilist.ts +9 -7
- package/src/parser/block/mathblock.test.ts +31 -32
- package/src/parser/block/mathblock.ts +24 -23
- package/src/parser/block/mediablock.ts +7 -7
- package/src/parser/block/olist.test.ts +102 -103
- package/src/parser/block/olist.ts +11 -12
- package/src/parser/block/pagebreak.test.ts +15 -16
- package/src/parser/block/pagebreak.ts +5 -5
- package/src/parser/block/paragraph.test.ts +57 -58
- package/src/parser/block/paragraph.ts +1 -1
- package/src/parser/block/reply/cite.test.ts +39 -40
- package/src/parser/block/reply/cite.ts +5 -5
- package/src/parser/block/reply/quote.test.ts +50 -51
- package/src/parser/block/reply/quote.ts +8 -7
- package/src/parser/block/reply.test.ts +19 -20
- package/src/parser/block/reply.ts +2 -2
- package/src/parser/block/sidefence.test.ts +41 -48
- package/src/parser/block/sidefence.ts +17 -11
- package/src/parser/block/table.test.ts +48 -49
- package/src/parser/block/table.ts +10 -9
- package/src/parser/block/ulist.test.ts +52 -53
- package/src/parser/block/ulist.ts +9 -8
- package/src/parser/block.ts +63 -51
- package/src/parser/context.ts +35 -32
- package/src/parser/document.ts +48 -0
- package/src/parser/header.test.ts +19 -20
- package/src/parser/header.ts +31 -25
- package/src/parser/inline/annotation.test.ts +49 -50
- package/src/parser/inline/annotation.ts +14 -16
- package/src/parser/inline/autolink/account.test.ts +32 -33
- package/src/parser/inline/autolink/account.ts +18 -19
- package/src/parser/inline/autolink/anchor.test.ts +21 -22
- package/src/parser/inline/autolink/anchor.ts +7 -8
- package/src/parser/inline/autolink/channel.test.ts +14 -15
- package/src/parser/inline/autolink/email.test.ts +36 -37
- package/src/parser/inline/autolink/email.ts +6 -6
- package/src/parser/inline/autolink/hashnum.test.ts +32 -33
- package/src/parser/inline/autolink/hashnum.ts +7 -8
- package/src/parser/inline/autolink/hashtag.test.ts +59 -60
- package/src/parser/inline/autolink/hashtag.ts +8 -9
- package/src/parser/inline/autolink/url.test.ts +75 -76
- package/src/parser/inline/autolink/url.ts +13 -14
- package/src/parser/inline/autolink.ts +24 -11
- package/src/parser/inline/bracket.test.ts +73 -74
- package/src/parser/inline/bracket.ts +88 -63
- package/src/parser/inline/code.test.ts +30 -31
- package/src/parser/inline/code.ts +6 -6
- package/src/parser/inline/deletion.test.ts +27 -28
- package/src/parser/inline/deletion.ts +5 -5
- package/src/parser/inline/emphasis.test.ts +39 -40
- package/src/parser/inline/emphasis.ts +5 -5
- package/src/parser/inline/emstrong.test.ts +101 -102
- package/src/parser/inline/emstrong.ts +103 -85
- package/src/parser/inline/extension/index.test.ts +91 -92
- package/src/parser/inline/extension/index.ts +17 -13
- package/src/parser/inline/extension/indexee.ts +4 -4
- package/src/parser/inline/extension/indexer.test.ts +23 -24
- package/src/parser/inline/extension/indexer.ts +6 -5
- package/src/parser/inline/extension/label.test.ts +32 -33
- package/src/parser/inline/extension/label.ts +14 -5
- package/src/parser/inline/extension/placeholder.test.ts +42 -43
- package/src/parser/inline/extension/placeholder.ts +8 -9
- package/src/parser/inline/html.test.ts +109 -109
- package/src/parser/inline/html.ts +27 -27
- package/src/parser/inline/htmlentity.test.ts +37 -38
- package/src/parser/inline/htmlentity.ts +6 -7
- package/src/parser/inline/insertion.test.ts +27 -28
- package/src/parser/inline/insertion.ts +5 -5
- package/src/parser/inline/italic.test.ts +55 -56
- package/src/parser/inline/italic.ts +5 -5
- package/src/parser/inline/link.test.ts +186 -187
- package/src/parser/inline/link.ts +29 -30
- package/src/parser/inline/mark.test.ts +31 -32
- package/src/parser/inline/mark.ts +6 -6
- package/src/parser/inline/math.test.ts +140 -141
- package/src/parser/inline/math.ts +6 -7
- package/src/parser/inline/media.test.ts +92 -93
- package/src/parser/inline/media.ts +31 -37
- package/src/parser/inline/reference.test.ts +111 -112
- package/src/parser/inline/reference.ts +61 -32
- package/src/parser/inline/remark.test.ts +49 -50
- package/src/parser/inline/remark.ts +13 -13
- package/src/parser/inline/ruby.test.ts +49 -50
- package/src/parser/inline/ruby.ts +60 -49
- package/src/parser/inline/shortmedia.test.ts +9 -10
- package/src/parser/inline/shortmedia.ts +11 -9
- package/src/parser/inline/strong.test.ts +36 -37
- package/src/parser/inline/strong.ts +5 -5
- package/src/parser/inline/template.test.ts +22 -23
- package/src/parser/inline/template.ts +13 -16
- package/src/parser/inline.test.ts +225 -226
- package/src/parser/inline.ts +68 -34
- package/src/parser/parser.ts +51 -0
- package/src/parser/repeat.ts +118 -91
- package/src/parser/segment.test.ts +0 -11
- package/src/parser/segment.ts +25 -28
- package/src/parser/source/escapable.test.ts +23 -24
- package/src/parser/source/escapable.ts +20 -20
- package/src/parser/source/line.test.ts +17 -18
- package/src/parser/source/line.ts +19 -24
- package/src/parser/source/str.ts +17 -10
- package/src/parser/source/text.test.ts +88 -89
- package/src/parser/source/text.ts +19 -20
- package/src/parser/source/unescapable.test.ts +23 -24
- package/src/parser/source/unescapable.ts +16 -16
- package/src/parser/util.ts +1 -1
- package/src/parser/visibility.ts +35 -14
- package/src/processor/figure.test.ts +20 -20
- package/src/processor/figure.ts +18 -10
- package/src/processor/note.test.ts +13 -13
- package/src/processor/note.ts +4 -2
- package/src/renderer/render/media/pdf.ts +2 -2
- package/src/renderer/render/media/twitter.ts +2 -2
- package/src/renderer/render/media.test.ts +12 -12
- package/src/renderer/render.test.ts +11 -11
- package/src/util/info.test.ts +2 -2
- package/src/util/quote.test.ts +3 -3
- package/src/util/quote.ts +6 -5
- package/src/util/toc.test.ts +12 -12
- package/src/combinator/control/constraint/block.test.ts +0 -20
- package/src/combinator/control/constraint/block.ts +0 -28
- package/src/combinator/control/constraint/contract.ts +0 -27
- package/src/combinator/control/constraint/line.test.ts +0 -21
- package/src/combinator/control/constraint/line.ts +0 -42
- package/src/combinator/control/manipulation/clear.ts +0 -5
- package/src/combinator/control/manipulation/convert.ts +0 -22
- package/src/combinator/control/manipulation/duplicate.ts +0 -7
- package/src/combinator/control/manipulation/fence.ts +0 -54
- package/src/combinator/control/manipulation/indent.test.ts +0 -31
- package/src/combinator/control/manipulation/indent.ts +0 -39
- package/src/combinator/control/manipulation/lazy.ts +0 -8
- package/src/combinator/control/manipulation/match.ts +0 -27
- package/src/combinator/control/manipulation/recovery.ts +0 -18
- package/src/combinator/control/manipulation/reverse.ts +0 -8
- package/src/combinator/control/manipulation/scope.ts +0 -61
- package/src/combinator/control/manipulation/surround.ts +0 -223
- package/src/combinator/control/monad/bind.ts +0 -26
- package/src/combinator/control/monad/fmap.ts +0 -10
- package/src/combinator/data/parser/context.ts +0 -96
- package/src/combinator/data/parser/inits.ts +0 -20
- package/src/combinator/data/parser/sequence.test.ts +0 -33
- package/src/combinator/data/parser/sequence.ts +0 -20
- package/src/combinator/data/parser/some.test.ts +0 -37
- package/src/combinator/data/parser/subsequence.test.ts +0 -41
- package/src/combinator/data/parser/subsequence.ts +0 -13
- package/src/combinator/data/parser/tails.ts +0 -8
- package/src/combinator/data/parser/union.test.ts +0 -33
- package/src/combinator/data/parser/union.ts +0 -18
- package/src/combinator/data/parser.ts +0 -144
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { sidefence } from './sidefence';
|
|
2
2
|
import { some } from '../../combinator';
|
|
3
|
-
import { input } from '
|
|
4
|
-
import { Context } from '../context';
|
|
3
|
+
import { input } from '../context';
|
|
5
4
|
import { inspect } from '../../debug.test';
|
|
6
5
|
|
|
7
6
|
describe('Unit: parser/block/sidefence', () => {
|
|
@@ -9,58 +8,52 @@ describe('Unit: parser/block/sidefence', () => {
|
|
|
9
8
|
const parser = some(sidefence);
|
|
10
9
|
|
|
11
10
|
it('invalid', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser, input(''
|
|
13
|
-
assert.deepStrictEqual(inspect(parser, input('\n'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser, input('|'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser, input('|a'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser, input('|\n'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser, input('
|
|
18
|
-
assert.deepStrictEqual(inspect(parser, input('
|
|
11
|
+
assert.deepStrictEqual(inspect(parser, input('')), undefined);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('\n')), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('|')), undefined);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('|a')), undefined);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('|\n')), undefined);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('|\na')), undefined);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('|\n| a')), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input(' | ')), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('||')), undefined);
|
|
19
20
|
});
|
|
20
21
|
|
|
21
22
|
it('basic', () => {
|
|
22
|
-
assert.deepStrictEqual(inspect(parser, input('| '
|
|
23
|
-
assert.deepStrictEqual(inspect(parser, input('| \\'
|
|
24
|
-
assert.deepStrictEqual(inspect(parser, input('| \\\n'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser, input('| a'
|
|
26
|
-
assert.deepStrictEqual(inspect(parser, input('| a\n'
|
|
27
|
-
assert.deepStrictEqual(inspect(parser, input('| a\nb',
|
|
28
|
-
assert.deepStrictEqual(inspect(parser, input('| a\n b ',
|
|
29
|
-
assert.deepStrictEqual(inspect(parser, input('| a\n|'
|
|
30
|
-
assert.deepStrictEqual(inspect(parser, input('| a\n
|
|
31
|
-
assert.deepStrictEqual(inspect(parser, input('| a\n| b '
|
|
32
|
-
assert.deepStrictEqual(inspect(parser, input('| a\n|\n'
|
|
33
|
-
assert.deepStrictEqual(inspect(parser, input('|
|
|
34
|
-
assert.deepStrictEqual(inspect(parser, input('|
|
|
35
|
-
assert.deepStrictEqual(inspect(parser, input('|
|
|
36
|
-
assert.deepStrictEqual(inspect(parser, input('|
|
|
37
|
-
assert.deepStrictEqual(inspect(parser, input('|
|
|
38
|
-
assert.deepStrictEqual(inspect(parser, input('|
|
|
39
|
-
assert.deepStrictEqual(inspect(parser, input('|
|
|
40
|
-
assert.deepStrictEqual(inspect(parser, input('|
|
|
41
|
-
assert.deepStrictEqual(inspect(parser, input('
|
|
42
|
-
assert.deepStrictEqual(inspect(parser, input('
|
|
43
|
-
assert.deepStrictEqual(inspect(parser, input('| http://host', new Context())), [['<blockquote class="invalid"><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
|
|
44
|
-
assert.deepStrictEqual(inspect(parser, input('| http://host)', new Context())), [['<blockquote class="invalid"><pre><a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
|
|
45
|
-
assert.deepStrictEqual(inspect(parser, input('| !http://host', new Context())), [['<blockquote class="invalid"><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
|
|
46
|
-
assert.deepStrictEqual(inspect(parser, input('| !http://host)', new Context())), [['<blockquote class="invalid"><pre>!<a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
|
|
47
|
-
assert.deepStrictEqual(inspect(parser, input('| #a', new Context())), [['<blockquote class="invalid"><pre><a class="hashtag" href="/hashtags/a">#a</a></pre></blockquote>'], '']);
|
|
48
|
-
assert.deepStrictEqual(inspect(parser, input('| @a#b', new Context())), [['<blockquote class="invalid"><pre><a class="channel" href="/@a?ch=b">@a#b</a></pre></blockquote>'], '']);
|
|
49
|
-
assert.deepStrictEqual(inspect(parser, input('| >>1\n| | b', new Context())), [['<blockquote class="invalid"><pre><a class="anchor" href="?at=1">>>1</a><br>| b</pre></blockquote>'], '']);
|
|
50
|
-
assert.deepStrictEqual(inspect(parser, input('| >>1\n| | b\n| c', new Context())), [['<blockquote class="invalid"><pre><a class="anchor" href="?at=1">>>1</a><br>| b<br>c</pre></blockquote>'], '']);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('| ')), [['<blockquote class="invalid"></blockquote>'], '']);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('| \\')), [['<blockquote class="invalid"><pre>\\</pre></blockquote>'], '']);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('| \\\n')), [['<blockquote class="invalid"><pre>\\</pre></blockquote>'], '']);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input('| a')), [['<blockquote class="invalid"><pre>a</pre></blockquote>'], '']);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser, input('| a\n')), [['<blockquote class="invalid"><pre>a</pre></blockquote>'], '']);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser, input('| a\nb')), [['<blockquote class="invalid"><pre>a</pre><pre class="invalid">b</pre></blockquote>'], '']);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser, input('| a\n b \n')), [['<blockquote class="invalid"><pre>a</pre><pre class="invalid"> b</pre></blockquote>'], '']);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser, input('| a\n|')), [['<blockquote class="invalid"><pre>a<br></pre></blockquote>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser, input('| a\n||1')), [['<blockquote class="invalid"><pre>a</pre><pre class="invalid">||1</pre></blockquote>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser, input('| a\n| b ')), [['<blockquote class="invalid"><pre>a<br>b </pre></blockquote>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser, input('| a\n|\n')), [['<blockquote class="invalid"><pre>a<br></pre></blockquote>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('| a ')), [['<blockquote class="invalid"><pre> a </pre></blockquote>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('| \na')), [['<blockquote class="invalid"><pre class="invalid">a</pre></blockquote>'], '']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser, input('| http://host')), [['<blockquote class="invalid"><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser, input('| http://host)')), [['<blockquote class="invalid"><pre><a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser, input('| !http://host')), [['<blockquote class="invalid"><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
|
|
39
|
+
assert.deepStrictEqual(inspect(parser, input('| !http://host)')), [['<blockquote class="invalid"><pre>!<a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
|
|
40
|
+
assert.deepStrictEqual(inspect(parser, input('| #a')), [['<blockquote class="invalid"><pre><a class="hashtag" href="/hashtags/a">#a</a></pre></blockquote>'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser, input('| @a#b')), [['<blockquote class="invalid"><pre><a class="channel" href="/@a?ch=b">@a#b</a></pre></blockquote>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('| ||1\n| | b')), [['<blockquote class="invalid"><pre>||1<br>| b</pre></blockquote>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser, input('| ||1\n| | b\n| c')), [['<blockquote class="invalid"><pre>||1<br>| b<br>c</pre></blockquote>'], '']);
|
|
51
44
|
});
|
|
52
45
|
|
|
53
46
|
it('nest', () => {
|
|
54
|
-
assert.deepStrictEqual(inspect(parser, input('| a\n||'
|
|
55
|
-
assert.deepStrictEqual(inspect(parser, input('| a\n|| b\n| c'
|
|
56
|
-
assert.deepStrictEqual(inspect(parser, input('| a\n|| b\n|| c'
|
|
57
|
-
assert.deepStrictEqual(inspect(parser, input('| a\n|| b\n||| c'
|
|
58
|
-
assert.deepStrictEqual(inspect(parser, input('|| a'
|
|
59
|
-
assert.deepStrictEqual(inspect(parser, input('|| a\n|'
|
|
60
|
-
assert.deepStrictEqual(inspect(parser, input('|| a\n| b'
|
|
61
|
-
assert.deepStrictEqual(inspect(parser, input('|| a\n||| b\n| c'
|
|
62
|
-
assert.deepStrictEqual(inspect(parser, input('|| a\n| b\n||| c'
|
|
63
|
-
assert.deepStrictEqual(inspect(parser, input('||| a\n|| b\n| c'
|
|
47
|
+
assert.deepStrictEqual(inspect(parser, input('| a\n||')), [['<blockquote class="invalid"><pre>a</pre><blockquote></blockquote></blockquote>'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser, input('| a\n|| b\n| c')), [['<blockquote class="invalid"><pre>a</pre><blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser, input('| a\n|| b\n|| c')), [['<blockquote class="invalid"><pre>a</pre><blockquote><pre>b<br>c</pre></blockquote></blockquote>'], '']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser, input('| a\n|| b\n||| c')), [['<blockquote class="invalid"><pre>a</pre><blockquote><pre>b</pre><blockquote><pre>c</pre></blockquote></blockquote></blockquote>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser, input('|| a')), [['<blockquote class="invalid"><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser, input('|| a\n|')), [['<blockquote class="invalid"><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser, input('|| a\n| b')), [['<blockquote class="invalid"><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote>'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser, input('|| a\n||| b\n| c')), [['<blockquote class="invalid"><blockquote><pre>a</pre><blockquote><pre>b</pre></blockquote></blockquote><pre>c</pre></blockquote>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser, input('|| a\n| b\n||| c')), [['<blockquote class="invalid"><blockquote><pre>a</pre></blockquote><pre>b</pre><blockquote><blockquote><pre>c</pre></blockquote></blockquote></blockquote>'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser, input('||| a\n|| b\n| c')), [['<blockquote class="invalid"><blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
|
|
64
57
|
});
|
|
65
58
|
|
|
66
59
|
});
|
|
@@ -1,33 +1,39 @@
|
|
|
1
1
|
import { SidefenceParser } from '../block';
|
|
2
|
-
import { Recursion } from '../context';
|
|
3
|
-
import { List, Node } from '../../combinator/
|
|
4
|
-
import { union, some, recursion, block,
|
|
2
|
+
import { Input, Recursion } from '../context';
|
|
3
|
+
import { List, Node } from '../../combinator/parser';
|
|
4
|
+
import { union, some, force, recursion, scope, block, line, validate, rewrite, open, lazy, fmap } from '../../combinator';
|
|
5
5
|
import { autolink } from '../autolink';
|
|
6
6
|
import { contentline } from '../source';
|
|
7
7
|
import { unwrap, invalid } from '../util';
|
|
8
8
|
import { html, define, defrag } from 'typed-dom/dom';
|
|
9
9
|
|
|
10
|
-
export const sidefence: SidefenceParser = lazy(() => block(fmap(
|
|
11
|
-
|
|
12
|
-
union([source])),
|
|
10
|
+
export const sidefence: SidefenceParser = lazy(() => validate(/\|+ /y, block(fmap(
|
|
11
|
+
union([source]),
|
|
13
12
|
([{ value }]) => new List([
|
|
14
13
|
new Node(define(value, {
|
|
15
14
|
class: 'invalid',
|
|
16
15
|
...invalid('sidefence', 'syntax', 'Reserved syntax'),
|
|
17
16
|
})),
|
|
18
|
-
]))));
|
|
17
|
+
])))));
|
|
19
18
|
|
|
20
19
|
const opener = /(?=\|\|+(?:$|[ \r\n]))/y;
|
|
21
20
|
const indent = open(opener, some(contentline, /\|(?:$|[ \r\n])/y));
|
|
22
|
-
const unindent = (source:
|
|
21
|
+
const unindent = ({ source }: Input) => source.replace(/(?<=^|\n)\|(?: |(?=\|*(?:$|[ \r\n])))|\r?\n$/g, '');
|
|
23
22
|
|
|
24
23
|
const source: SidefenceParser.SourceParser = lazy(() => fmap(
|
|
25
24
|
recursion(Recursion.block, some(union([
|
|
26
25
|
rewrite(
|
|
27
26
|
indent,
|
|
28
|
-
|
|
27
|
+
scope(unindent, source, false)),
|
|
29
28
|
rewrite(
|
|
30
|
-
some(contentline, opener),
|
|
31
|
-
|
|
29
|
+
some(validate(/\|(?:$|[ \r\n])/y, contentline), opener),
|
|
30
|
+
scope(unindent, force(fmap(autolink, ns => new List([new Node(html('pre', defrag(unwrap(ns))))]))), false)),
|
|
31
|
+
line(({source}, output) => output.append(
|
|
32
|
+
new Node(html('pre',
|
|
33
|
+
{
|
|
34
|
+
class: 'invalid',
|
|
35
|
+
...invalid('sidefence', 'syntax', 'Missing the start symbol "|"'),
|
|
36
|
+
},
|
|
37
|
+
source.trimEnd())))),
|
|
32
38
|
]))),
|
|
33
39
|
ns => new List([new Node(html('blockquote', unwrap(ns)))])));
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { table } from './table';
|
|
2
2
|
import { some } from '../../combinator';
|
|
3
|
-
import { input } from '
|
|
4
|
-
import { Context } from '../context';
|
|
3
|
+
import { input } from '../context';
|
|
5
4
|
import { inspect } from '../../debug.test';
|
|
6
5
|
|
|
7
6
|
describe('Unit: parser/block/table', () => {
|
|
@@ -9,62 +8,62 @@ describe('Unit: parser/block/table', () => {
|
|
|
9
8
|
const parser = some(table);
|
|
10
9
|
|
|
11
10
|
it('invalid', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser, input(''
|
|
13
|
-
assert.deepStrictEqual(inspect(parser, input('\n'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser, input('|'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser, input('||'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser, input('|||'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser, input('|\n|'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser, input('|\n|\n|'
|
|
19
|
-
assert.deepStrictEqual(inspect(parser, input('|h'
|
|
20
|
-
assert.deepStrictEqual(inspect(parser, input('|h'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser, input('|h\n'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser, input('|h\n|'
|
|
23
|
-
assert.deepStrictEqual(inspect(parser, input('|h\n|b'
|
|
24
|
-
assert.deepStrictEqual(inspect(parser, input('|h\n|-\nb'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser, input('|h\n|-\n |b'
|
|
26
|
-
assert.deepStrictEqual(inspect(parser, input('|h\n |-\n|b'
|
|
27
|
-
assert.deepStrictEqual(inspect(parser, input(' |h\n|-\n|b'
|
|
11
|
+
assert.deepStrictEqual(inspect(parser, input('')), undefined);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('\n')), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('|')), undefined);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('||')), undefined);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('|||')), undefined);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('|\n|')), undefined);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('|\n|\n|')), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input('|h')), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('|h')), undefined);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n')), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n|')), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n|b')), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n|-\nb')), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n|-\n |b')), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('|h\n |-\n|b')), undefined);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input(' |h\n|-\n|b')), undefined);
|
|
28
27
|
});
|
|
29
28
|
|
|
30
29
|
it('valid', () => {
|
|
31
|
-
assert.deepStrictEqual(inspect(parser, input('|\n|-\n|'
|
|
32
|
-
assert.deepStrictEqual(inspect(parser, input('||\n|-|\n||'
|
|
33
|
-
assert.deepStrictEqual(inspect(parser, input('|||\n|-|-|\n|||'
|
|
34
|
-
assert.deepStrictEqual(inspect(parser, input('|"|\n|-\n|'
|
|
35
|
-
assert.deepStrictEqual(inspect(parser, input('|`|`|\n|-\n|'
|
|
36
|
-
assert.deepStrictEqual(inspect(parser, input('|((|\n|-\n|'
|
|
37
|
-
assert.deepStrictEqual(inspect(parser, input('|a|b|\n|-|-|\n|1|2|'
|
|
38
|
-
assert.deepStrictEqual(inspect(parser, input('|a|b\n|-|-\n|1|2'
|
|
39
|
-
assert.deepStrictEqual(inspect(parser, input('|a|\n|-|\n|1|'
|
|
40
|
-
assert.deepStrictEqual(inspect(parser, input('|a\n|-\n|1'
|
|
41
|
-
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||'
|
|
42
|
-
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\ '
|
|
44
|
-
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\\n'
|
|
45
|
-
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\\n||'
|
|
46
|
-
assert.deepStrictEqual(inspect(parser, input('|| \n|- \n|| '
|
|
47
|
-
assert.deepStrictEqual(inspect(parser, input('|| \n|-| \n|| '
|
|
30
|
+
assert.deepStrictEqual(inspect(parser, input('|\n|-\n|')), [['<table><thead><tr></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-|\n||')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser, input('|||\n|-|-|\n|||')), [['<table><thead><tr><th></th><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser, input('|"|\n|-\n|')), [['<table><thead><tr><th>"</th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('|`|`|\n|-\n|')), [['<table><thead><tr><th><code data-src="`|`">|</code></th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('|((|\n|-\n|')), [['<table><thead><tr><th><span class="paren">(<span class="paren">(</span></span></th></tr></thead><tbody><tr></tr></tbody></table>'], '']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser, input('|a|b|\n|-|-|\n|1|2|')), [['<table><thead><tr><th>a</th><th>b</th></tr></thead><tbody><tr><td>1</td><td>2</td></tr></tbody></table>'], '']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser, input('|a|b\n|-|-\n|1|2')), [['<table><thead><tr><th>a</th><th>b</th></tr></thead><tbody><tr><td>1</td><td>2</td></tr></tbody></table>'], '']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser, input('|a|\n|-|\n|1|')), [['<table><thead><tr><th>a</th></tr></thead><tbody><tr><td>1</td></tr></tbody></table>'], '']);
|
|
39
|
+
assert.deepStrictEqual(inspect(parser, input('|a\n|-\n|1')), [['<table><thead><tr><th>a</th></tr></thead><tbody><tr><td>1</td></tr></tbody></table>'], '']);
|
|
40
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\ ')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\\n')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr></tbody></table>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser, input('||\n|-\n||\\\n||')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td><td></td></tr><tr><td></td></tr></tbody></table>'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser, input('|| \n|- \n|| ')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser, input('|| \n|-| \n|| ')), [['<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>'], '']);
|
|
48
47
|
});
|
|
49
48
|
|
|
50
49
|
it('align', () => {
|
|
51
|
-
assert.deepStrictEqual(inspect(parser, input('|h|\n|:-|\n|b|'
|
|
52
|
-
assert.deepStrictEqual(inspect(parser, input('|h|\n|-:|\n|b|'
|
|
53
|
-
assert.deepStrictEqual(inspect(parser, input('|h|\n|:-:|\n|b|'
|
|
54
|
-
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|-|\n|b|b|'
|
|
55
|
-
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|:-|\n|b|b|'
|
|
56
|
-
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|:-:|\n|b|b|'
|
|
57
|
-
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|-:|\n|b|b|'
|
|
58
|
-
assert.deepStrictEqual(inspect(parser, input('|h|h|h|\n|:-:|:-|-:|\n|b|b|b|'
|
|
59
|
-
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|\n|b|b|'
|
|
60
|
-
assert.deepStrictEqual(inspect(parser, input('|h|h|\n|:-|-|\n|b|b|'
|
|
50
|
+
assert.deepStrictEqual(inspect(parser, input('|h|\n|:-|\n|b|')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="start">b</td></tr></tbody></table>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser, input('|h|\n|-:|\n|b|')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="end">b</td></tr></tbody></table>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser, input('|h|\n|:-:|\n|b|')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td align="center">b</td></tr></tbody></table>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser, input('|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>'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser, input('|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, input('|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>'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser, input('|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>'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser, input('|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>'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser, input('|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>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser, input('|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>'], '']);
|
|
61
60
|
});
|
|
62
61
|
|
|
63
62
|
it('trim', () => {
|
|
64
|
-
assert.deepStrictEqual(inspect(parser, input('| h \n|- \n| b '
|
|
65
|
-
assert.deepStrictEqual(inspect(parser, input('| h | \n|- \n| b | '
|
|
66
|
-
assert.deepStrictEqual(inspect(parser, input('|\\ h \\\n|- \n|\\ b \\'
|
|
67
|
-
assert.deepStrictEqual(inspect(parser, input('|\\ h \\ \n|- \n|\\ b \\ | '
|
|
63
|
+
assert.deepStrictEqual(inspect(parser, input('| h \n|- \n| b ')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
64
|
+
assert.deepStrictEqual(inspect(parser, input('| 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, input('|\\ 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, input('|\\ h \\ \n|- \n|\\ b \\ | ')), [['<table><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody></table>'], '']);
|
|
68
67
|
});
|
|
69
68
|
|
|
70
69
|
});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TableParser } from '../block';
|
|
2
|
-
import { List, Node } from '../../combinator/
|
|
2
|
+
import { List, Node } from '../../combinator/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';
|
|
@@ -30,20 +30,21 @@ export const table: TableParser = lazy(() => block(fmap(validate(
|
|
|
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
32
|
ns => new List([new Node(html('tr', unwrap(ns)))])),
|
|
33
|
-
rewrite(contentline, ({ source }) =>
|
|
33
|
+
rewrite(contentline, ({ source }, output) => output.append(
|
|
34
34
|
new Node(html('tr', {
|
|
35
35
|
class: 'invalid',
|
|
36
|
-
...invalid('table
|
|
37
|
-
}, [html('td', source.replace(/\r?\n/, ''))]))
|
|
38
|
-
])));
|
|
36
|
+
...invalid('table', 'syntax', 'Missing the start symbol "|"'),
|
|
37
|
+
}, [html('td', source.replace(/\r?\n/, ''))])))));
|
|
39
38
|
|
|
40
39
|
const align: AlignParser = fmap(open(
|
|
41
40
|
'|',
|
|
42
41
|
union([
|
|
43
|
-
focus(/:-+:?/y, ({ source, position, range }) =>
|
|
44
|
-
new
|
|
45
|
-
|
|
46
|
-
|
|
42
|
+
focus(/:-+:?/y, ({ source, position, range }, output) => output.append(
|
|
43
|
+
new Node(source[position + range - 1] === ':' ? 'center' : 'start')),
|
|
44
|
+
false),
|
|
45
|
+
focus(/-+:?/y, ({ source, position, range }, output) => output.append(
|
|
46
|
+
new Node(source[position + range - 1] === ':' ? 'end' : '')),
|
|
47
|
+
false),
|
|
47
48
|
])),
|
|
48
49
|
ns => new List([new Node(html('td', defrag(unwrap(ns))))]));
|
|
49
50
|
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { ulist } from './ulist';
|
|
2
2
|
import { some } from '../../combinator';
|
|
3
|
-
import { input } from '
|
|
4
|
-
import { Context } from '../context';
|
|
3
|
+
import { input } from '../context';
|
|
5
4
|
import { inspect } from '../../debug.test';
|
|
6
5
|
|
|
7
6
|
describe('Unit: parser/block/ulist', () => {
|
|
@@ -9,77 +8,77 @@ describe('Unit: parser/block/ulist', () => {
|
|
|
9
8
|
const parser = some(ulist);
|
|
10
9
|
|
|
11
10
|
it('invalid', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser, input(''
|
|
13
|
-
assert.deepStrictEqual(inspect(parser, input('\n'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser, input('-'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser, input('--'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser, input('-0'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser, input('-a'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser, input('-[]'
|
|
19
|
-
assert.deepStrictEqual(inspect(parser, input('-[ ]'
|
|
20
|
-
assert.deepStrictEqual(inspect(parser, input('-[x]'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser, input('-\n'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser, input('-\n- a'
|
|
23
|
-
assert.deepStrictEqual(inspect(parser, input(' - '
|
|
24
|
-
assert.deepStrictEqual(inspect(parser, input('+'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser, input('*'
|
|
11
|
+
assert.deepStrictEqual(inspect(parser, input('')), undefined);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('\n')), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('-')), undefined);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('--')), undefined);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('-0')), undefined);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('-a')), undefined);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('-[]')), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input('-[ ]')), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('-[x]')), undefined);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser, input('-\n')), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('-\n- a')), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input(' - ')), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('+')), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('*')), undefined);
|
|
26
25
|
});
|
|
27
26
|
|
|
28
27
|
it('single', () => {
|
|
29
28
|
// pending
|
|
30
|
-
assert.deepStrictEqual(inspect(parser, input('- '
|
|
29
|
+
assert.deepStrictEqual(inspect(parser, input('- ')), [['<ul><li></li></ul>'], '']);
|
|
31
30
|
// filled
|
|
32
|
-
assert.deepStrictEqual(inspect(parser, input('- \\'
|
|
33
|
-
assert.deepStrictEqual(inspect(parser, input('- \\\n'
|
|
34
|
-
assert.deepStrictEqual(inspect(parser, input('- -'
|
|
35
|
-
assert.deepStrictEqual(inspect(parser, input('- -\n'
|
|
31
|
+
assert.deepStrictEqual(inspect(parser, input('- \\')), [['<ul><li id="index::\\">\\</li></ul>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser, input('- \\\n')), [['<ul><li id="index::\\">\\</li></ul>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser, input('- -')), [['<ul><li id="index::-">-</li></ul>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('- -\n')), [['<ul><li id="index::-">-</li></ul>'], '']);
|
|
36
35
|
});
|
|
37
36
|
|
|
38
37
|
it('multiple', () => {
|
|
39
38
|
// pending
|
|
40
|
-
assert.deepStrictEqual(inspect(parser, input('- \n-'
|
|
39
|
+
assert.deepStrictEqual(inspect(parser, input('- \n-')), [['<ul><li></li><li></li></ul>'], '']);
|
|
41
40
|
// filled
|
|
42
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n- 2'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n- 2\n- 3'
|
|
41
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n- 2')), [['<ul><li id="index::1">1</li><li id="index::2">2</li></ul>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('- 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>'], '']);
|
|
44
43
|
// invalid
|
|
45
|
-
assert.deepStrictEqual(inspect(parser, input('- \n+'
|
|
46
|
-
assert.deepStrictEqual(inspect(parser, input('- \n0'
|
|
44
|
+
assert.deepStrictEqual(inspect(parser, input('- \n+')), [['<ul><li></li><li id="index::+"><span class="invalid">+</span></li></ul>'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser, input('- \n0')), [['<ul><li></li><li id="index::0"><span class="invalid">0</span></li></ul>'], '']);
|
|
47
46
|
});
|
|
48
47
|
|
|
49
48
|
it('nest', () => {
|
|
50
|
-
assert.deepStrictEqual(inspect(parser, input('- \n -'
|
|
51
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n - 2'
|
|
52
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n - 2\n- 3'
|
|
53
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n - 2\n - 3'
|
|
54
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n - 2\n - 3'
|
|
55
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n - 2\n - 3'
|
|
56
|
-
assert.deepStrictEqual(inspect(parser, input('- \n -\n +\n -\n +\n+'
|
|
57
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n + 2'
|
|
58
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n 0'
|
|
59
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n 0.'
|
|
60
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n 0. '
|
|
61
|
-
assert.deepStrictEqual(inspect(parser, input('- 1\n 0. 2'
|
|
62
|
-
assert.deepStrictEqual(inspect(parser, input('- a [#b]'
|
|
63
|
-
assert.deepStrictEqual(inspect(parser, input('- http://host\\'
|
|
64
|
-
assert.deepStrictEqual(inspect(parser, input('- !http://host'
|
|
49
|
+
assert.deepStrictEqual(inspect(parser, input('- \n -')), [['<ul><li><br><ul><li></li></ul></li></ul>'], '']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n - 2')), [['<ul><li id="index::1">1<ul><li id="index::2">2</li></ul></li></ul>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser, input('- 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>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser, input('- 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>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser, input('- 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>'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser, input('- 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>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser, input('- \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>'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n + 2')), [['<ul><li id="index::1">1<ul class="invalid"><li>2</li></ul></li></ul>'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n 0')), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n 0.')), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n 0. ')), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser, input('- 1\n 0. 2')), [['<ul><li id="index::1">1<ol><li id="index::2">2</li></ol></li></ul>'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser, input('- a [#b]')), [['<ul><li id="index::a_b">a <a class="index" href="#index::b">b</a></li></ul>'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser, input('- http://host\\')), [['<ul><li id="index::http://host\\"><a class="url" href="http://host\\" target="_blank">http://host\\</a></li></ul>'], '']);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser, input('- !http://host')), [['<ul><li id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></li></ul>'], '']);
|
|
65
64
|
});
|
|
66
65
|
|
|
67
66
|
it('checkbox', () => {
|
|
68
|
-
assert.deepStrictEqual(inspect(parser, input('- [ ]'
|
|
69
|
-
assert.deepStrictEqual(inspect(parser, input('- [x]'
|
|
70
|
-
assert.deepStrictEqual(inspect(parser, input('- [X]'
|
|
71
|
-
assert.deepStrictEqual(inspect(parser, input('- [X] 1'
|
|
67
|
+
assert.deepStrictEqual(inspect(parser, input('- [ ]')), [['<ul class="checklist"><li><span class="checkbox">☐</span></li></ul>'], '']);
|
|
68
|
+
assert.deepStrictEqual(inspect(parser, input('- [x]')), [['<ul class="checklist"><li><span class="checkbox">☑</span></li></ul>'], '']);
|
|
69
|
+
assert.deepStrictEqual(inspect(parser, input('- [X]')), [['<ul class="checklist"><li><span class="checkbox">☑</span></li></ul>'], '']);
|
|
70
|
+
assert.deepStrictEqual(inspect(parser, input('- [X] 1')), [['<ul class="checklist"><li id="index::1"><span class="checkbox">☑</span>1</li></ul>'], '']);
|
|
72
71
|
});
|
|
73
72
|
|
|
74
73
|
it('indexer', () => {
|
|
75
|
-
assert.deepStrictEqual(inspect(parser, input('- [|a]'
|
|
76
|
-
assert.deepStrictEqual(inspect(parser, input('- a [|]'
|
|
77
|
-
assert.deepStrictEqual(inspect(parser, input('- a [|b]'
|
|
78
|
-
assert.deepStrictEqual(inspect(parser, input('- - [|b]'
|
|
79
|
-
assert.deepStrictEqual(inspect(parser, input('- [ ] [|a]'
|
|
80
|
-
assert.deepStrictEqual(inspect(parser, input('- [ ] a [|b]'
|
|
81
|
-
assert.deepStrictEqual(inspect(parser, input('- a [|]\n - c [|d]'
|
|
82
|
-
assert.deepStrictEqual(inspect(parser, input('- a [|b]\n - c [|d]'
|
|
74
|
+
assert.deepStrictEqual(inspect(parser, input('- [|a]')), [['<ul><li id="index::[|a]"><span class="invalid">[|a]</span></li></ul>'], '']);
|
|
75
|
+
assert.deepStrictEqual(inspect(parser, input('- a [|]')), [['<ul><li>a<span class="indexer" data-index=""></span></li></ul>'], '']);
|
|
76
|
+
assert.deepStrictEqual(inspect(parser, input('- a [|b]')), [['<ul><li id="index::b">a<span class="indexer" data-index="b"></span></li></ul>'], '']);
|
|
77
|
+
assert.deepStrictEqual(inspect(parser, input('- - [|b]')), [['<ul><li id="index::b">-<span class="indexer" data-index="b"></span></li></ul>'], '']);
|
|
78
|
+
assert.deepStrictEqual(inspect(parser, input('- [ ] [|a]')), [['<ul class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span><span class="invalid">[|a]</span></li></ul>'], '']);
|
|
79
|
+
assert.deepStrictEqual(inspect(parser, input('- [ ] a [|b]')), [['<ul class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ul>'], '']);
|
|
80
|
+
assert.deepStrictEqual(inspect(parser, input('- 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>'], '']);
|
|
81
|
+
assert.deepStrictEqual(inspect(parser, input('- 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>'], '']);
|
|
83
82
|
});
|
|
84
83
|
|
|
85
84
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { UListParser } from '../block';
|
|
2
2
|
import { Recursion } from '../context';
|
|
3
|
-
import { List, Node } from '../../combinator/
|
|
3
|
+
import { List, Node } from '../../combinator/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';
|
|
@@ -13,15 +13,16 @@ export const ulist: UListParser = lazy(() => block(validate(
|
|
|
13
13
|
'- ',
|
|
14
14
|
ulist_)));
|
|
15
15
|
|
|
16
|
+
// TODO: リストマーカーの直書き
|
|
16
17
|
export const ulist_: UListParser = lazy(() => block(fmap(validate(
|
|
17
18
|
/-(?=$|[ \r\n])/y,
|
|
18
|
-
recursion(Recursion.
|
|
19
|
+
recursion(Recursion.block, some(union([
|
|
19
20
|
indexee(fmap(fallback(
|
|
20
21
|
inits([
|
|
21
|
-
|
|
22
|
+
open(/-(?=$|[ \r\n]) ?/y, subsequence([
|
|
22
23
|
checkbox,
|
|
23
|
-
visualize(trimBlank(some(union([indexer, inline])))),
|
|
24
|
-
]), true)
|
|
24
|
+
line(visualize(trimBlank(some(union([indexer, inline]))))),
|
|
25
|
+
]), true),
|
|
25
26
|
indent(union([ulist_, olist_, ilist_])),
|
|
26
27
|
]),
|
|
27
28
|
ilistitem),
|
|
@@ -31,9 +32,9 @@ export const ulist_: UListParser = lazy(() => block(fmap(validate(
|
|
|
31
32
|
|
|
32
33
|
export const checkbox = focus(
|
|
33
34
|
/\[[xX ]\](?=$|[ \r\n])/y,
|
|
34
|
-
({ source, position }) =>
|
|
35
|
-
new Node(html('span', { class: 'checkbox' }, source[position + 1].trimStart() ? '☑' : '☐')),
|
|
36
|
-
|
|
35
|
+
({ source, position }, output) => output.append(
|
|
36
|
+
new Node(html('span', { class: 'checkbox' }, source[position + 1].trimStart() ? '☑' : '☐'))),
|
|
37
|
+
false);
|
|
37
38
|
|
|
38
39
|
export function fillFirstLine(nodes: List<Node<string | HTMLElement>>): List<Node<string | HTMLElement>> {
|
|
39
40
|
const node = nodes.head?.value;
|