securemark 0.299.3 → 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 +8 -0
- package/design.md +0 -6
- package/dist/index.js +3479 -2750
- package/index.d.ts +2 -1
- package/index.ts +2 -2
- package/markdown.d.ts +209 -183
- package/package.json +1 -1
- package/src/{parser/api → api}/bind.test.ts +2 -24
- package/src/{parser/api → api}/bind.ts +18 -13
- package/src/{parser/api → api}/body.test.ts +1 -1
- package/src/{parser/api → api}/cache.ts +1 -1
- package/src/{parser/api → api}/header.test.ts +1 -1
- package/src/{parser/api → api}/header.ts +9 -6
- package/src/{parser/api → api}/normalize.test.ts +1 -1
- package/src/{parser/api → api}/parse.test.ts +120 -124
- package/src/api/parse.ts +30 -0
- package/src/api/run.ts +6 -0
- package/src/{parser/api.ts → 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/node.ts → parser/list.ts} +38 -13
- 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 +31 -32
- 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 +32 -38
- 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/node.ts +1 -1
- 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 +36 -15
- package/src/{parser/processor → processor}/figure.test.ts +23 -23
- package/src/{parser/processor → processor}/figure.ts +20 -12
- package/src/{parser/processor → processor}/note.test.ts +15 -15
- package/src/{parser/processor → processor}/note.ts +6 -4
- 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 -13
- 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
- package/src/parser/api/parse.ts +0 -48
- package/src/parser.ts +0 -1
- /package/src/{parser/api → api}/body.ts +0 -0
- /package/src/{parser/api → api}/normalize.ts +0 -0
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { placeholder } from './placeholder';
|
|
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/inline/extension/placeholder', () => {
|
|
@@ -9,50 +8,50 @@ describe('Unit: parser/inline/extension/placeholder', () => {
|
|
|
9
8
|
const parser = some(placeholder);
|
|
10
9
|
|
|
11
10
|
it('invalid', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser, input('[]'
|
|
13
|
-
assert.deepStrictEqual(inspect(parser, input('[a]'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser, input('[ab]'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser, input('[^]'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser, input('[^]]'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser, input('[^\\]'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser, input('[^ ]'
|
|
19
|
-
assert.deepStrictEqual(inspect(parser, input('[^ a]'
|
|
20
|
-
assert.deepStrictEqual(inspect(parser, input('[^\\ ]'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser, input('[^\\ a]'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser, input('[^\n]'
|
|
23
|
-
assert.deepStrictEqual(inspect(parser, input('[^\na]'
|
|
24
|
-
assert.deepStrictEqual(inspect(parser, input('[^\\\na]'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser, input('[^ !http://host]'
|
|
26
|
-
assert.deepStrictEqual(inspect(parser, input('[^a'
|
|
27
|
-
assert.deepStrictEqual(inspect(parser, input('[[]'
|
|
28
|
-
assert.deepStrictEqual(inspect(parser, input('[]]'
|
|
29
|
-
assert.deepStrictEqual(inspect(parser, input('[[]]'
|
|
30
|
-
assert.deepStrictEqual(inspect(parser, input('[[ ]]'
|
|
31
|
-
assert.deepStrictEqual(inspect(parser, input('[[a]]'
|
|
32
|
-
assert.deepStrictEqual(inspect(parser, input(' [^a]'
|
|
11
|
+
assert.deepStrictEqual(inspect(parser, input('[]')), undefined);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('[a]')), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('[ab]')), undefined);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('[^]')), undefined);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('[^]]')), undefined);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('[^\\]')), [['[^', ']'], '']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('[^ ]')), undefined);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input('[^ a]')), undefined);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('[^\\ ]')), undefined);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser, input('[^\\ a]')), undefined);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('[^\n]')), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('[^\na]')), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('[^\\\na]')), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('[^ !http://host]')), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('[^a')), [['[^', 'a'], '']);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input('[[]')), undefined);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser, input('[]]')), undefined);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser, input('[[]]')), undefined);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser, input('[[ ]]')), undefined);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser, input('[[a]]')), undefined);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser, input(' [^a]')), undefined);
|
|
33
32
|
});
|
|
34
33
|
|
|
35
34
|
it('valid', () => {
|
|
36
|
-
assert.deepStrictEqual(inspect(parser, input('[^a]'
|
|
37
|
-
assert.deepStrictEqual(inspect(parser, input('[^a b]'
|
|
38
|
-
assert.deepStrictEqual(inspect(parser, input('[^a ]'
|
|
39
|
-
assert.deepStrictEqual(inspect(parser, input('[^a ]'
|
|
40
|
-
assert.deepStrictEqual(inspect(parser, input('[^a\\ ]'
|
|
41
|
-
assert.deepStrictEqual(inspect(parser, input('[^a\\ \\ ]'
|
|
42
|
-
assert.deepStrictEqual(inspect(parser, input('[^a\n]'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser, input('[^a\\\n]'
|
|
44
|
-
assert.deepStrictEqual(inspect(parser, input('[^a\nb]'
|
|
45
|
-
assert.deepStrictEqual(inspect(parser, input('[^a\\\nb]'
|
|
46
|
-
assert.deepStrictEqual(inspect(parser, input('[^a<wbr>]'
|
|
47
|
-
assert.deepStrictEqual(inspect(parser, input('[^a<wbr><wbr>]'
|
|
48
|
-
assert.deepStrictEqual(inspect(parser, input('[^==]'
|
|
49
|
-
assert.deepStrictEqual(inspect(parser, input('[^a[% b %]]'
|
|
50
|
-
assert.deepStrictEqual(inspect(parser, input('[^a[% b %][% c %]]'
|
|
51
|
-
assert.deepStrictEqual(inspect(parser, input('[^\\]]'
|
|
52
|
-
assert.deepStrictEqual(inspect(parser, input('[^(])]'
|
|
53
|
-
assert.deepStrictEqual(inspect(parser, input('[^!http://host]'
|
|
54
|
-
assert.deepStrictEqual(inspect(parser, input('[^[% a %]]'
|
|
55
|
-
assert.deepStrictEqual(inspect(parser, input('[^[% a %]b]'
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('[^a]')), [['<span class="invalid">[^a]</span>'], '']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser, input('[^a b]')), [['<span class="invalid">[^a b]</span>'], '']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser, input('[^a ]')), [['<span class="invalid">[^a ]</span>'], '']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser, input('[^a ]')), [['<span class="invalid">[^a ]</span>'], '']);
|
|
39
|
+
assert.deepStrictEqual(inspect(parser, input('[^a\\ ]')), [['<span class="invalid">[^a\\ ]</span>'], '']);
|
|
40
|
+
assert.deepStrictEqual(inspect(parser, input('[^a\\ \\ ]')), [['<span class="invalid">[^a\\ \\ ]</span>'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser, input('[^a\n]')), [['<span class="invalid">[^a\n]</span>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('[^a\\\n]')), [['<span class="invalid">[^a\\\n]</span>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser, input('[^a\nb]')), [['<span class="invalid">[^a\nb]</span>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser, input('[^a\\\nb]')), [['<span class="invalid">[^a\\\nb]</span>'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser, input('[^a<wbr>]')), [['<span class="invalid">[^a<wbr>]</span>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser, input('[^a<wbr><wbr>]')), [['<span class="invalid">[^a<wbr><wbr>]</span>'], '']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser, input('[^==]')), [['<span class="invalid">[^==]</span>'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser, input('[^a[% b %]]')), [['<span class="invalid">[^a[% b %]]</span>'], '']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser, input('[^a[% b %][% c %]]')), [['<span class="invalid">[^a[% b %][% c %]]</span>'], '']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser, input('[^\\]]')), [['<span class="invalid">[^\\]]</span>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser, input('[^(])]')), [['<span class="invalid">[^(])]</span>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser, input('[^!http://host]')), [['<span class="invalid">[^!http://host]</span>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser, input('[^[% a %]]')), [['<span class="invalid">[^[% a %]]</span>'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser, input('[^[% a %]b]')), [['<span class="invalid">[^[% a %]b]</span>'], '']);
|
|
56
55
|
});
|
|
57
56
|
|
|
58
57
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ExtensionParser } from '../../inline';
|
|
2
2
|
import { Recursion, Backtrack } from '../../context';
|
|
3
|
-
import { List, Node } from '../../../combinator/
|
|
4
|
-
import { union, some, recursion, precedence, surround, lazy } from '../../../combinator';
|
|
3
|
+
import { List, Node } from '../../../combinator/parser';
|
|
4
|
+
import { union, some, recursion, precedence, backtrack, surround, lazy } from '../../../combinator';
|
|
5
5
|
import { inline } from '../../inline';
|
|
6
6
|
import { str } from '../../source';
|
|
7
7
|
import { beforeNonblank } from '../../visibility';
|
|
@@ -12,20 +12,19 @@ import { html } from 'typed-dom/dom';
|
|
|
12
12
|
|
|
13
13
|
// All syntax surrounded by square brackets shouldn't contain line breaks.
|
|
14
14
|
|
|
15
|
-
export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => surround(
|
|
15
|
+
export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => backtrack(surround(
|
|
16
16
|
// ^はabbrで使用済みだが^:などのようにして分離使用可能
|
|
17
17
|
str(/\[[:^|]/y, beforeNonblank),
|
|
18
|
-
precedence(1, recursion(Recursion.
|
|
18
|
+
precedence(1, recursion(Recursion.inline,
|
|
19
19
|
some(union([inline]), ']', [[']', 1]]))),
|
|
20
20
|
str(']'),
|
|
21
21
|
false,
|
|
22
22
|
[3 | Backtrack.common],
|
|
23
|
-
(_,
|
|
24
|
-
new Node(html('span',
|
|
23
|
+
(_, input, output) =>
|
|
24
|
+
output.append(new Node(html('span',
|
|
25
25
|
{
|
|
26
26
|
class: 'invalid',
|
|
27
27
|
...invalid('extension', 'syntax', `Invalid start symbol or linebreak`),
|
|
28
28
|
},
|
|
29
|
-
|
|
30
|
-
])
|
|
31
|
-
([as, bs]) => bs && as.import(bs as List<Node<string>>)));
|
|
29
|
+
input.source.slice(input.position - input.range, input.position)))),
|
|
30
|
+
([as, bs], _, output) => bs && output.import(as.import(bs as List<Node<string>>)))));
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { html, TAGS } from './html';
|
|
2
|
+
import { Output } from '../../combinator/parser';
|
|
2
3
|
import { some } from '../../combinator';
|
|
3
|
-
import { input } from '
|
|
4
|
-
import { Context } from '../context';
|
|
4
|
+
import { input } from '../context';
|
|
5
5
|
import { inspect } from '../../debug.test';
|
|
6
6
|
|
|
7
7
|
describe('Unit: parser/inline/html', () => {
|
|
@@ -9,131 +9,131 @@ describe('Unit: parser/inline/html', () => {
|
|
|
9
9
|
const parser = some(html);
|
|
10
10
|
|
|
11
11
|
it('hash', () => {
|
|
12
|
-
assert(TAGS.every(tag => parser(input(`<${tag}
|
|
12
|
+
assert(TAGS.every(tag => parser(input(`<${tag}>`), new Output())));
|
|
13
13
|
});
|
|
14
14
|
|
|
15
15
|
it('xss', () => {
|
|
16
|
-
assert.deepStrictEqual(inspect(parser, input('<script>'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser, input('<script>alert()<script>'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser, input('<script>alert()</script>'
|
|
19
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi onclick="alert()">'
|
|
20
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi onclick="alert()"></bdi>'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi onclick="alert()">a</bdi>'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi><bdi onclick="alert()">a</bdi></bdi>'
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('<script>')), [['<span class="invalid"><script></span>'], '']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('<script>alert()<script>')), [['<span class="invalid"><script>alert()<script></span>'], '']);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input('<script>alert()</script>')), [['<span class="invalid"><script>alert()</script></span>'], '']);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi onclick="alert()">')), [['<span class="invalid"><bdi onclick="alert()"></span>'], '']);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi onclick="alert()"></bdi>')), [['<span class="invalid"><bdi onclick="alert()"></bdi></span>'], '']);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi onclick="alert()">a</bdi>')), [['<span class="invalid"><bdi onclick="alert()">a</bdi></span>'], '']);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi><bdi onclick="alert()">a</bdi></bdi>')), [['<bdi><span class="invalid"><bdi onclick="alert()">a</bdi></span></bdi>'], '']);
|
|
23
23
|
});
|
|
24
24
|
|
|
25
25
|
it('invalid', () => {
|
|
26
|
-
assert.deepStrictEqual(inspect(parser, input(''
|
|
27
|
-
assert.deepStrictEqual(inspect(parser, input('<0>'
|
|
28
|
-
assert.deepStrictEqual(inspect(parser, input('<aT>'
|
|
29
|
-
assert.deepStrictEqual(inspect(parser, input('<a,b>'
|
|
30
|
-
assert.deepStrictEqual(inspect(parser, input('<a, b>'
|
|
31
|
-
assert.deepStrictEqual(inspect(parser, input('<T>'
|
|
32
|
-
assert.deepStrictEqual(inspect(parser, input('<wbr/>'
|
|
33
|
-
assert.deepStrictEqual(inspect(parser, input('<wbr />'
|
|
34
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>'
|
|
35
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>z'
|
|
36
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi></bdi>'
|
|
37
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi> </bdi>'
|
|
38
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi> \n</bdi>'
|
|
39
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi> \na</bdi>'
|
|
40
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>\\ </bdi>'
|
|
41
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>	</bdi>'
|
|
42
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi><wbr></bdi>'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>\n</bdi>'
|
|
44
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>\na</bdi>'
|
|
45
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>\\\na</bdi>'
|
|
46
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a'
|
|
47
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a</BDI>'
|
|
48
|
-
assert.deepStrictEqual(inspect(parser, input('<BDI>a</BDI>'
|
|
49
|
-
assert.deepStrictEqual(inspect(parser, input('<BDI>a</bdi>'
|
|
50
|
-
assert.deepStrictEqual(inspect(parser, input('</bdi>'
|
|
51
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi/>'
|
|
52
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi />'
|
|
53
|
-
assert.deepStrictEqual(inspect(parser, input('<b><b><b>a</b></b></b>'
|
|
54
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi><bdi><bdi>a</bdi></bdi></bdi>'
|
|
55
|
-
assert.deepStrictEqual(inspect(parser, input('<x a="*b*"'
|
|
56
|
-
assert.deepStrictEqual(inspect(parser, input('<x a="*b*">'
|
|
57
|
-
assert.deepStrictEqual(inspect(parser, input('<x a="*b*">c'
|
|
58
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi a="*b*"'
|
|
59
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi a="*b*">'
|
|
60
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi a="*b*">c'
|
|
61
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi a b="*" *c*'
|
|
62
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi a b="*" *c*>'
|
|
63
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi a b="*" *c*>d</bdi>'
|
|
64
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi a b="*" *>*c*'
|
|
65
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi a b="*" *>*c*</bdi>'
|
|
66
|
-
assert.deepStrictEqual(inspect(parser, input(' <bdi>a</bdi>'
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input('')), undefined);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser, input('<0>')), undefined);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser, input('<aT>')), [['<span class="invalid"><aT></span>'], '']);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser, input('<a,b>')), undefined);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser, input('<a, b>')), undefined);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser, input('<T>')), [['<span class="invalid"><T></span>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser, input('<wbr/>')), undefined);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser, input('<wbr />')), [['<span class="invalid"><wbr /></span>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>')), [['<span class="invalid"><bdi></span>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>z')), [['<span class="invalid"><bdi>z</span>'], '']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi></bdi>')), [['<span class="invalid"><bdi></bdi></span>'], '']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi> </bdi>')), [['<span class="invalid"><bdi> </bdi></span>'], '']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi> \n</bdi>')), [['<span class="invalid"><bdi> \n</bdi></span>'], '']);
|
|
39
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi> \na</bdi>')), [['<span class="invalid"><bdi> \na</bdi></span>'], '']);
|
|
40
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>\\ </bdi>')), [['<span class="invalid"><bdi>\\ </bdi></span>'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>	</bdi>')), [['<span class="invalid"><bdi>&Tab;</bdi></span>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi><wbr></bdi>')), [['<span class="invalid"><bdi><wbr></bdi></span>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>\n</bdi>')), [['<span class="invalid"><bdi>\n</bdi></span>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>\na</bdi>')), [['<span class="invalid"><bdi>\na</bdi></span>'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>\\\na</bdi>')), [['<span class="invalid"><bdi>\\\na</bdi></span>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a')), [['<span class="invalid"><bdi>a</span>'], '']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a</BDI>')), [['<span class="invalid"><bdi>a</BDI></span>'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser, input('<BDI>a</BDI>')), [['<span class="invalid"><BDI></span>'], 'a</BDI>']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser, input('<BDI>a</bdi>')), [['<span class="invalid"><BDI></span>'], 'a</bdi>']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser, input('</bdi>')), undefined);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi/>')), undefined);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi />')), [['<span class="invalid"><bdi /></span>'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser, input('<b><b><b>a</b></b></b>')), [['<span class="invalid"><b><b><b>a</b></b></b></span>'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi><bdi><bdi>a</bdi></bdi></bdi>')), [['<bdi><bdi><bdi>a</bdi></bdi></bdi>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser, input('<x a="*b*"')), [['<span class="invalid"><x a="*b*"</span>'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser, input('<x a="*b*">')), [['<span class="invalid"><x a="*b*"></span>'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser, input('<x a="*b*">c')), [['<span class="invalid"><x a="*b*"></span>'], 'c']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi a="*b*"')), [['<span class="invalid"><bdi a="*b*"</span>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi a="*b*">')), [['<span class="invalid"><bdi a="*b*"></span>'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi a="*b*">c')), [['<span class="invalid"><bdi a="*b*">c</span>'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi a b="*" *c*')), [['<span class="invalid"><bdi a b="*" *c*</span>'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi a b="*" *c*>')), [['<span class="invalid"><bdi a b="*" *c*></span>'], '']);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi a b="*" *c*>d</bdi>')), [['<span class="invalid"><bdi a b="*" *c*>d</bdi></span>'], '']);
|
|
64
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi a b="*" *>*c*')), [['<span class="invalid"><bdi a b="*" *>*c*</span>'], '']);
|
|
65
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi a b="*" *>*c*</bdi>')), [['<span class="invalid"><bdi a b="*" *>*c*</bdi></span>'], '']);
|
|
66
|
+
assert.deepStrictEqual(inspect(parser, input(' <bdi>a</bdi>')), undefined);
|
|
67
67
|
});
|
|
68
68
|
|
|
69
69
|
it('basic', () => {
|
|
70
|
-
assert.deepStrictEqual(inspect(parser, input('<wbr>'
|
|
71
|
-
assert.deepStrictEqual(inspect(parser, input('<wbr >'
|
|
72
|
-
assert.deepStrictEqual(inspect(parser, input('<wbr >'
|
|
73
|
-
assert.deepStrictEqual(inspect(parser, input('<wbr>a'
|
|
74
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi >a</bdi>'
|
|
75
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi >a</bdi>'
|
|
76
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi> a</bdi>'
|
|
77
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi> a </bdi>'
|
|
78
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi> a </bdi>'
|
|
79
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>\\ a</bdi>'
|
|
80
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi><wbr>a</bdi>'
|
|
81
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a</bdi>'
|
|
82
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a</bdi>a'
|
|
83
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a </bdi>'
|
|
84
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a \n </bdi>'
|
|
85
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a\n</bdi>'
|
|
86
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a\n </bdi>'
|
|
87
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a\n<wbr></bdi>'
|
|
88
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a\nb</bdi>'
|
|
70
|
+
assert.deepStrictEqual(inspect(parser, input('<wbr>')), [['<wbr>'], '']);
|
|
71
|
+
assert.deepStrictEqual(inspect(parser, input('<wbr >')), [['<wbr>'], '']);
|
|
72
|
+
assert.deepStrictEqual(inspect(parser, input('<wbr >')), [['<span class="invalid"><wbr </span>'], ' >']);
|
|
73
|
+
assert.deepStrictEqual(inspect(parser, input('<wbr>a')), [['<wbr>'], 'a']);
|
|
74
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi >a</bdi>')), [['<bdi>a</bdi>'], '']);
|
|
75
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi >a</bdi>')), [['<span class="invalid"><bdi >a</bdi></span>'], '']);
|
|
76
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi> a</bdi>')), [['<bdi> a</bdi>'], '']);
|
|
77
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi> a </bdi>')), [['<bdi> a </bdi>'], '']);
|
|
78
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi> a </bdi>')), [['<bdi> a </bdi>'], '']);
|
|
79
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>\\ a</bdi>')), [['<bdi> a</bdi>'], '']);
|
|
80
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi><wbr>a</bdi>')), [['<bdi><wbr>a</bdi>'], '']);
|
|
81
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a</bdi>')), [['<bdi>a</bdi>'], '']);
|
|
82
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a</bdi>a')), [['<bdi>a</bdi>'], 'a']);
|
|
83
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a </bdi>')), [['<bdi>a </bdi>'], '']);
|
|
84
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a \n </bdi>')), [['<bdi>a </bdi>'], '']);
|
|
85
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a\n</bdi>')), [['<bdi>a</bdi>'], '']);
|
|
86
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a\n </bdi>')), [['<bdi>a </bdi>'], '']);
|
|
87
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a\n<wbr></bdi>')), [['<bdi>a<wbr></bdi>'], '']);
|
|
88
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a\nb</bdi>')), [['<bdi>a<br>b</bdi>'], '']);
|
|
89
89
|
});
|
|
90
90
|
|
|
91
91
|
it('nest', () => {
|
|
92
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>[% </bdi>'
|
|
93
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi><bdi>a</bdi></bdi>'
|
|
94
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a<bdi>b</bdi>c</bdi>'
|
|
95
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>`a`</bdi>'
|
|
92
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>[% </bdi>')), [['<span class="invalid"><bdi>[% </bdi></span>'], '']);
|
|
93
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi><bdi>a</bdi></bdi>')), [['<bdi><bdi>a</bdi></bdi>'], '']);
|
|
94
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a<bdi>b</bdi>c</bdi>')), [['<bdi>a<bdi>b</bdi>c</bdi>'], '']);
|
|
95
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>`a`</bdi>')), [['<bdi><code data-src="`a`">a</code></bdi>'], '']);
|
|
96
96
|
});
|
|
97
97
|
|
|
98
98
|
it('escape', () => {
|
|
99
|
-
assert.deepStrictEqual(inspect(parser, input('<a>'
|
|
100
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi><a>a</a></bdi>'
|
|
101
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi>a<a>b</a>c</bdi>'
|
|
102
|
-
assert.deepStrictEqual(inspect(parser, input('<img>'
|
|
103
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi><img></bdi>'
|
|
99
|
+
assert.deepStrictEqual(inspect(parser, input('<a>')), [['<span class="invalid"><a></span>'], '']);
|
|
100
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi><a>a</a></bdi>')), [['<bdi><span class="invalid"><a>a</a></span></bdi>'], '']);
|
|
101
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi>a<a>b</a>c</bdi>')), [['<bdi>a<span class="invalid"><a>b</a></span>c</bdi>'], '']);
|
|
102
|
+
assert.deepStrictEqual(inspect(parser, input('<img>')), [['<span class="invalid"><img></span>'], '']);
|
|
103
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi><img></bdi>')), [['<bdi><span class="invalid"><img></span></bdi>'], '']);
|
|
104
104
|
});
|
|
105
105
|
|
|
106
106
|
it('attribute', () => {
|
|
107
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi\n>a</bdi>'
|
|
108
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi \n>a</bdi>'
|
|
109
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi __proto__>a</bdi>'
|
|
110
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi constructor>a</bdi>'
|
|
111
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi toString>a</bdi>'
|
|
112
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi X>a</bdi>'
|
|
113
|
-
assert.deepStrictEqual(inspect(parser, input('<bdi x>a</bdi>'
|
|
114
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo>a</bdo>'
|
|
115
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo >a</bdo>'
|
|
116
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo __proto__>a</bdo>'
|
|
117
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo constructor>a</bdo>'
|
|
118
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo toString>a</bdo>'
|
|
119
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo X>a</bdo>'
|
|
120
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo x>a</bdo>'
|
|
121
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo dir>a</bdo>'
|
|
122
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo dir=>a</bdo>'
|
|
123
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo dir=rtl>a</bdo>'
|
|
124
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo dir=">a</bdo>'
|
|
125
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo dir="">a</bdo>'
|
|
126
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo dir="rtl" dir="rtl">a</bdo>'
|
|
127
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo diR="rtl">a</bdo>'
|
|
128
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo dir="rtl">a</bdo>'
|
|
129
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo dir="rtl" >a</bdo>'
|
|
130
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo dir="rtl" >a</bdo>'
|
|
131
|
-
assert.deepStrictEqual(inspect(parser, input('<bdo dir="rtl">a</bdo>'
|
|
132
|
-
assert.deepStrictEqual(inspect(parser, input('<wbr\n>'
|
|
133
|
-
assert.deepStrictEqual(inspect(parser, input('<wbr \n>'
|
|
134
|
-
assert.deepStrictEqual(inspect(parser, input('<wbr constructor>'
|
|
135
|
-
assert.deepStrictEqual(inspect(parser, input('<wbr X>'
|
|
136
|
-
assert.deepStrictEqual(inspect(parser, input('<wbr x>'
|
|
107
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi\n>a</bdi>')), undefined);
|
|
108
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi \n>a</bdi>')), [['<span class="invalid"><bdi \n>a</bdi></span>'], '']);
|
|
109
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi __proto__>a</bdi>')), [['<span class="invalid"><bdi __proto__>a</bdi></span>'], '']);
|
|
110
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi constructor>a</bdi>')), [['<span class="invalid"><bdi constructor>a</bdi></span>'], '']);
|
|
111
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi toString>a</bdi>')), [['<span class="invalid"><bdi toString>a</bdi></span>'], '']);
|
|
112
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi X>a</bdi>')), [['<span class="invalid"><bdi X>a</bdi></span>'], '']);
|
|
113
|
+
assert.deepStrictEqual(inspect(parser, input('<bdi x>a</bdi>')), [['<span class="invalid"><bdi x>a</bdi></span>'], '']);
|
|
114
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo>a</bdo>')), [['<span class="invalid"><bdo>a</bdo></span>'], '']);
|
|
115
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo >a</bdo>')), [['<span class="invalid"><bdo >a</bdo></span>'], '']);
|
|
116
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo __proto__>a</bdo>')), [['<span class="invalid"><bdo __proto__>a</bdo></span>'], '']);
|
|
117
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo constructor>a</bdo>')), [['<span class="invalid"><bdo constructor>a</bdo></span>'], '']);
|
|
118
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo toString>a</bdo>')), [['<span class="invalid"><bdo toString>a</bdo></span>'], '']);
|
|
119
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo X>a</bdo>')), [['<span class="invalid"><bdo X>a</bdo></span>'], '']);
|
|
120
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo x>a</bdo>')), [['<span class="invalid"><bdo x>a</bdo></span>'], '']);
|
|
121
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo dir>a</bdo>')), [['<span class="invalid"><bdo dir>a</bdo></span>'], '']);
|
|
122
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo dir=>a</bdo>')), [['<span class="invalid"><bdo dir=>a</bdo></span>'], '']);
|
|
123
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo dir=rtl>a</bdo>')), [['<span class="invalid"><bdo dir=rtl>a</bdo></span>'], '']);
|
|
124
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo dir=">a</bdo>')), [['<span class="invalid"><bdo dir=">a</bdo></span>'], '']);
|
|
125
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo dir="">a</bdo>')), [['<span class="invalid"><bdo dir="">a</bdo></span>'], '']);
|
|
126
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo dir="rtl" dir="rtl">a</bdo>')), [['<span class="invalid"><bdo dir="rtl" dir="rtl">a</bdo></span>'], '']);
|
|
127
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo diR="rtl">a</bdo>')), [['<span class="invalid"><bdo diR="rtl">a</bdo></span>'], '']);
|
|
128
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo dir="rtl">a</bdo>')), [['<bdo dir="rtl">a</bdo>'], '']);
|
|
129
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo dir="rtl" >a</bdo>')), [['<bdo dir="rtl">a</bdo>'], '']);
|
|
130
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo dir="rtl" >a</bdo>')), [['<span class="invalid"><bdo dir="rtl" >a</bdo></span>'], '']);
|
|
131
|
+
assert.deepStrictEqual(inspect(parser, input('<bdo dir="rtl">a</bdo>')), [['<span class="invalid"><bdo dir="rtl">a</bdo></span>'], '']);
|
|
132
|
+
assert.deepStrictEqual(inspect(parser, input('<wbr\n>')), undefined);
|
|
133
|
+
assert.deepStrictEqual(inspect(parser, input('<wbr \n>')), [['<span class="invalid"><wbr </span>'], '\n>']);
|
|
134
|
+
assert.deepStrictEqual(inspect(parser, input('<wbr constructor>')), [['<span class="invalid"><wbr constructor></span>'], '']);
|
|
135
|
+
assert.deepStrictEqual(inspect(parser, input('<wbr X>')), [['<span class="invalid"><wbr X></span>'], '']);
|
|
136
|
+
assert.deepStrictEqual(inspect(parser, input('<wbr x>')), [['<span class="invalid"><wbr x></span>'], '']);
|
|
137
137
|
});
|
|
138
138
|
|
|
139
139
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { HTMLParser } from '../inline';
|
|
2
|
-
import { Recursion } from '../context';
|
|
3
|
-
import { List, Node
|
|
2
|
+
import { Input, Recursion } from '../context';
|
|
3
|
+
import { List, Node } from '../../combinator/parser';
|
|
4
4
|
import { Flag } from '../node';
|
|
5
5
|
import { union, some, recursion, precedence, surround, open, match, lazy } from '../../combinator';
|
|
6
6
|
import { inline } from '../inline';
|
|
@@ -27,22 +27,22 @@ export const html: HTMLParser = lazy(() => union([
|
|
|
27
27
|
precedence(9, some(union([attribute]))),
|
|
28
28
|
open(str(/ ?/y), str('>'), true),
|
|
29
29
|
true, [],
|
|
30
|
-
([as, bs = new List(), cs],
|
|
31
|
-
|
|
32
|
-
([as, bs = new List()],
|
|
33
|
-
|
|
30
|
+
([as, bs = new List(), cs], input, output) =>
|
|
31
|
+
output.append(new Node(elem(as.head!.value.slice(1), false, [...unwrap(as.import(bs).import(cs))], new List(), new List(), input), as.head!.value === '<wbr' ? Flag.blank : Flag.none)),
|
|
32
|
+
([as, bs = new List()], input, output) =>
|
|
33
|
+
output.append(new Node(elem(as.head!.value.slice(1), false, [...unwrap(as.import(bs))], new List(), new List(), input)))),
|
|
34
34
|
match(
|
|
35
35
|
new RegExp(String.raw`<(${TAGS.join('|')})(?=[ >])`, 'y'),
|
|
36
36
|
memoize(
|
|
37
37
|
([, tag]) =>
|
|
38
|
-
surround<HTMLParser.TagParser
|
|
39
|
-
surround(
|
|
38
|
+
surround<HTMLParser.TagParser>(
|
|
39
|
+
surround<HTMLParser.VoidTagParser>(
|
|
40
40
|
str(`<${tag}`),
|
|
41
41
|
precedence(9, some(attribute)),
|
|
42
42
|
open(str(/ ?/y), str('>'), true),
|
|
43
43
|
true, [],
|
|
44
|
-
([as, bs = new List(), cs]) => as.import(bs).import(cs),
|
|
45
|
-
([as, bs = new List()]) => as.import(bs)),
|
|
44
|
+
([as, bs = new List(), cs], _, output) => output.import(as.import(bs).import(cs)),
|
|
45
|
+
([as, bs = new List()], _, output) => output.import(as.import(bs))),
|
|
46
46
|
// 不可視のHTML構造が可視構造を変化させるべきでない。
|
|
47
47
|
// 可視のHTMLは優先度変更を検討する。
|
|
48
48
|
// このため`<>`記号は将来的に共通構造を変化させる可能性があり
|
|
@@ -54,10 +54,10 @@ export const html: HTMLParser = lazy(() => union([
|
|
|
54
54
|
])))),
|
|
55
55
|
str(`</${tag}>`),
|
|
56
56
|
true, [],
|
|
57
|
-
([as, bs = new List(), cs],
|
|
58
|
-
|
|
59
|
-
([as, bs = new List()],
|
|
60
|
-
|
|
57
|
+
([as, bs = new List(), cs], input, output) =>
|
|
58
|
+
output.append(new Node(elem(tag, true, [...unwrap(as)], bs, cs, input))),
|
|
59
|
+
([as, bs = new List()], input, output) =>
|
|
60
|
+
output.append(new Node(elem(tag, true, [...unwrap(as)], bs, new List(), input)))),
|
|
61
61
|
([, tag]) => tag2index(tag),
|
|
62
62
|
Array(TAGS.length))),
|
|
63
63
|
surround(
|
|
@@ -66,10 +66,10 @@ export const html: HTMLParser = lazy(() => union([
|
|
|
66
66
|
precedence(9, some(union([attribute]))),
|
|
67
67
|
open(str(/ ?/y), str('>'), true),
|
|
68
68
|
true, [],
|
|
69
|
-
([as, bs = new List(), cs],
|
|
70
|
-
|
|
71
|
-
([as, bs = new List()],
|
|
72
|
-
|
|
69
|
+
([as, bs = new List(), cs], input, output) =>
|
|
70
|
+
output.append(new Node(elem(as.head!.value.slice(1), false, [...unwrap(as.import(bs).import(cs))], new List(), new List(), input))),
|
|
71
|
+
([as, bs = new List()], input, output) =>
|
|
72
|
+
output.append(new Node(elem(as.head!.value.slice(1), false, [...unwrap(as.import(bs))], new List(), new List(), input)))),
|
|
73
73
|
]));
|
|
74
74
|
|
|
75
75
|
export const attribute: HTMLParser.AttributeParser = union([
|
|
@@ -77,25 +77,25 @@ export const attribute: HTMLParser.AttributeParser = union([
|
|
|
77
77
|
str(/ [^\s<>]+/y),
|
|
78
78
|
]);
|
|
79
79
|
|
|
80
|
-
function elem(tag: string, content: boolean, as: readonly string[], bs: List<Node<HTMLElement | string>>, cs: List<Node<string>>,
|
|
80
|
+
function elem(tag: string, content: boolean, as: readonly string[], bs: List<Node<HTMLElement | string>>, cs: List<Node<string>>, input: Input): HTMLElement {
|
|
81
81
|
assert(as.length > 0);
|
|
82
82
|
assert(as[0][0] === '<');
|
|
83
|
-
if (!tags.includes(tag)) return ielem('tag', `Invalid HTML tag name "${tag}"`,
|
|
83
|
+
if (!tags.includes(tag)) return ielem('tag', `Invalid HTML tag name "${tag}"`, input);
|
|
84
84
|
if (content) {
|
|
85
|
-
if (cs.length === 0) return ielem('tag', `Missing the closing HTML tag "</${tag}>"`,
|
|
86
|
-
if (bs.length === 0) return ielem('content', `Missing the content`,
|
|
87
|
-
if (!isNonblankFirstLine(bs)) return ielem('content', `Missing the visible content in the same line`,
|
|
85
|
+
if (cs.length === 0) return ielem('tag', `Missing the closing HTML tag "</${tag}>"`, input);
|
|
86
|
+
if (bs.length === 0) return ielem('content', `Missing the content`, input);
|
|
87
|
+
if (!isNonblankFirstLine(bs)) return ielem('content', `Missing the visible content in the same line`, input);
|
|
88
88
|
}
|
|
89
89
|
const [attrs] = attributes('html', attrspecs[tag], as.slice(1, as.at(-1) === '>' ? -1 : as.length));
|
|
90
|
-
if (/(?<!\S)invalid(?!\S)/.test(attrs['class'] ?? '')) return ielem('attribute', 'Invalid HTML attribute',
|
|
91
|
-
if (as.at(-1) !== '>') return ielem('tag', `Missing the closing symbol ">"`,
|
|
90
|
+
if (/(?<!\S)invalid(?!\S)/.test(attrs['class'] ?? '')) return ielem('attribute', 'Invalid HTML attribute', input)
|
|
91
|
+
if (as.at(-1) !== '>') return ielem('tag', `Missing the closing symbol ">"`, input);
|
|
92
92
|
return h(tag as 'span', attrs, defrag(unwrap(bs)));
|
|
93
93
|
}
|
|
94
94
|
|
|
95
|
-
function ielem(type: string, message: string,
|
|
95
|
+
function ielem(type: string, message: string, input: Input): HTMLElement {
|
|
96
96
|
return h('span',
|
|
97
97
|
{ class: 'invalid', ...invalid('html', type, message) },
|
|
98
|
-
|
|
98
|
+
input.source.slice(input.position - input.range, input.position));
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
const requiredAttributes = memoize(
|