securemark 0.291.0 → 0.292.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/design.md +13 -2
- package/dist/index.js +1101 -760
- package/markdown.d.ts +17 -17
- package/package.json +1 -1
- package/src/combinator/control/constraint/block.test.ts +8 -5
- package/src/combinator/control/constraint/block.ts +9 -9
- package/src/combinator/control/constraint/contract.ts +20 -28
- package/src/combinator/control/constraint/line.test.ts +9 -6
- package/src/combinator/control/constraint/line.ts +21 -22
- package/src/combinator/control/manipulation/convert.ts +29 -13
- package/src/combinator/control/manipulation/fence.ts +18 -15
- package/src/combinator/control/manipulation/indent.test.ts +17 -14
- package/src/combinator/control/manipulation/indent.ts +21 -10
- package/src/combinator/control/manipulation/match.ts +11 -10
- package/src/combinator/control/manipulation/recovery.ts +6 -2
- package/src/combinator/control/manipulation/scope.ts +37 -38
- package/src/combinator/control/manipulation/surround.ts +78 -60
- package/src/combinator/control/manipulation/trim.test.ts +12 -9
- package/src/combinator/control/monad/bind.ts +16 -16
- package/src/combinator/control/monad/fmap.ts +6 -6
- package/src/combinator/data/parser/context/delimiter.ts +8 -7
- package/src/combinator/data/parser/context.test.ts +19 -14
- package/src/combinator/data/parser/context.ts +20 -16
- package/src/combinator/data/parser/inits.ts +13 -14
- package/src/combinator/data/parser/sequence.test.ts +16 -15
- package/src/combinator/data/parser/sequence.ts +13 -14
- package/src/combinator/data/parser/some.test.ts +19 -18
- package/src/combinator/data/parser/some.ts +13 -15
- package/src/combinator/data/parser/subsequence.test.ts +22 -21
- package/src/combinator/data/parser/subsequence.ts +3 -3
- package/src/combinator/data/parser/tails.ts +3 -3
- package/src/combinator/data/parser/union.test.ts +16 -15
- package/src/combinator/data/parser/union.ts +2 -2
- package/src/combinator/data/parser.ts +66 -28
- package/src/debug.test.ts +3 -3
- package/src/parser/api/bind.ts +3 -3
- package/src/parser/api/header.ts +7 -6
- package/src/parser/api/normalize.ts +2 -2
- package/src/parser/api/parse.test.ts +14 -15
- package/src/parser/api/parse.ts +3 -3
- package/src/parser/autolink.test.ts +19 -17
- package/src/parser/block/blockquote.test.ts +86 -84
- package/src/parser/block/blockquote.ts +4 -2
- package/src/parser/block/codeblock.test.ts +58 -56
- package/src/parser/block/codeblock.ts +3 -3
- package/src/parser/block/dlist.test.ts +58 -56
- package/src/parser/block/extension/aside.test.ts +10 -8
- package/src/parser/block/extension/aside.ts +1 -1
- package/src/parser/block/extension/example.test.ts +20 -18
- package/src/parser/block/extension/example.ts +3 -3
- package/src/parser/block/extension/fig.test.ts +38 -36
- package/src/parser/block/extension/fig.ts +1 -1
- package/src/parser/block/extension/figbase.test.ts +17 -15
- package/src/parser/block/extension/figure.test.ts +64 -62
- package/src/parser/block/extension/figure.ts +3 -2
- package/src/parser/block/extension/message.test.ts +15 -13
- package/src/parser/block/extension/message.ts +3 -3
- package/src/parser/block/extension/placeholder.test.ts +3 -1
- package/src/parser/block/extension/table.test.ts +73 -71
- package/src/parser/block/extension/table.ts +5 -5
- package/src/parser/block/extension.test.ts +3 -1
- package/src/parser/block/heading.test.ts +65 -64
- package/src/parser/block/heading.ts +3 -3
- package/src/parser/block/ilist.test.ts +3 -1
- package/src/parser/block/ilist.ts +3 -3
- package/src/parser/block/mathblock.test.ts +33 -31
- package/src/parser/block/mathblock.ts +1 -1
- package/src/parser/block/mediablock.ts +2 -2
- package/src/parser/block/olist.test.ts +99 -97
- package/src/parser/block/olist.ts +2 -2
- package/src/parser/block/pagebreak.test.ts +17 -15
- package/src/parser/block/pagebreak.ts +1 -1
- package/src/parser/block/paragraph.test.ts +60 -57
- package/src/parser/block/reply/cite.test.ts +41 -39
- package/src/parser/block/reply/cite.ts +3 -3
- package/src/parser/block/reply/quote.test.ts +52 -50
- package/src/parser/block/reply.test.ts +21 -19
- package/src/parser/block/sidefence.test.ts +51 -49
- package/src/parser/block/table.test.ts +51 -50
- package/src/parser/block/table.ts +6 -6
- package/src/parser/block/ulist.test.ts +52 -50
- package/src/parser/block/ulist.ts +2 -2
- package/src/parser/block.ts +6 -5
- package/src/parser/context.ts +1 -0
- package/src/parser/header.test.ts +22 -21
- package/src/parser/header.ts +25 -13
- package/src/parser/inline/annotation.test.ts +44 -42
- package/src/parser/inline/annotation.ts +2 -2
- package/src/parser/inline/autolink/account.test.ts +32 -30
- package/src/parser/inline/autolink/account.ts +1 -1
- package/src/parser/inline/autolink/anchor.test.ts +23 -21
- package/src/parser/inline/autolink/anchor.ts +1 -1
- package/src/parser/inline/autolink/channel.test.ts +16 -14
- package/src/parser/inline/autolink/channel.ts +2 -2
- package/src/parser/inline/autolink/email.test.ts +38 -36
- package/src/parser/inline/autolink/email.ts +2 -2
- package/src/parser/inline/autolink/hashnum.test.ts +39 -37
- package/src/parser/inline/autolink/hashnum.ts +1 -1
- package/src/parser/inline/autolink/hashtag.test.ts +58 -56
- package/src/parser/inline/autolink/hashtag.ts +1 -1
- package/src/parser/inline/autolink/url.test.ts +76 -74
- package/src/parser/inline/autolink/url.ts +6 -6
- package/src/parser/inline/bracket.test.ts +69 -67
- package/src/parser/inline/bracket.ts +32 -32
- package/src/parser/inline/code.test.ts +32 -29
- package/src/parser/inline/code.ts +20 -13
- package/src/parser/inline/deletion.test.ts +29 -27
- package/src/parser/inline/deletion.ts +2 -2
- package/src/parser/inline/emphasis.test.ts +40 -36
- package/src/parser/inline/emphasis.ts +2 -2
- package/src/parser/inline/emstrong.test.ts +102 -96
- package/src/parser/inline/emstrong.ts +96 -36
- package/src/parser/inline/extension/index.test.ts +91 -89
- package/src/parser/inline/extension/index.ts +18 -30
- package/src/parser/inline/extension/indexee.ts +1 -1
- package/src/parser/inline/extension/indexer.test.ts +26 -24
- package/src/parser/inline/extension/indexer.ts +1 -1
- package/src/parser/inline/extension/label.test.ts +34 -32
- package/src/parser/inline/extension/placeholder.test.ts +44 -42
- package/src/parser/inline/extension/placeholder.ts +11 -8
- package/src/parser/inline/html.test.ts +108 -106
- package/src/parser/inline/html.ts +24 -23
- package/src/parser/inline/htmlentity.test.ts +39 -37
- package/src/parser/inline/htmlentity.ts +9 -3
- package/src/parser/inline/insertion.test.ts +29 -27
- package/src/parser/inline/insertion.ts +2 -2
- package/src/parser/inline/italic.test.ts +55 -53
- package/src/parser/inline/italic.ts +2 -2
- package/src/parser/inline/link.test.ts +187 -185
- package/src/parser/inline/link.ts +30 -12
- package/src/parser/inline/mark.test.ts +31 -29
- package/src/parser/inline/mark.ts +3 -3
- package/src/parser/inline/math.test.ts +133 -131
- package/src/parser/inline/math.ts +2 -2
- package/src/parser/inline/media.test.ts +93 -91
- package/src/parser/inline/media.ts +41 -17
- package/src/parser/inline/reference.test.ts +110 -108
- package/src/parser/inline/reference.ts +49 -40
- package/src/parser/inline/remark.test.ts +53 -51
- package/src/parser/inline/remark.ts +3 -3
- package/src/parser/inline/ruby.test.ts +46 -44
- package/src/parser/inline/ruby.ts +29 -32
- package/src/parser/inline/shortmedia.test.ts +11 -9
- package/src/parser/inline/strong.test.ts +37 -33
- package/src/parser/inline/strong.ts +6 -3
- package/src/parser/inline/template.test.ts +24 -22
- package/src/parser/inline/template.ts +20 -11
- package/src/parser/inline.test.ts +221 -220
- package/src/parser/inline.ts +13 -8
- package/src/parser/segment.ts +13 -8
- package/src/parser/source/escapable.test.ts +24 -22
- package/src/parser/source/escapable.ts +26 -41
- package/src/parser/source/line.test.ts +19 -17
- package/src/parser/source/line.ts +3 -3
- package/src/parser/source/str.ts +28 -11
- package/src/parser/source/text.test.ts +85 -83
- package/src/parser/source/text.ts +26 -54
- package/src/parser/source/unescapable.test.ts +24 -22
- package/src/parser/source/unescapable.ts +18 -33
- package/src/parser/source.ts +1 -1
- package/src/parser/util.ts +36 -33
- package/src/parser/visibility.ts +19 -15
- package/src/util/quote.ts +4 -2
|
@@ -1,117 +1,119 @@
|
|
|
1
1
|
import { media } from './media';
|
|
2
2
|
import { some } from '../../combinator';
|
|
3
|
+
import { input } from '../../combinator/data/parser';
|
|
3
4
|
import { inspect } from '../../debug.test';
|
|
4
5
|
|
|
5
6
|
describe('Unit: parser/inline/media', () => {
|
|
6
7
|
describe('media', () => {
|
|
7
|
-
const parser = (source: string) => some(media)(
|
|
8
|
+
const parser = (source: string) => some(media)(input(source, ctx));
|
|
9
|
+
const { context: ctx } = input('', {});
|
|
8
10
|
|
|
9
11
|
it('xss', () => {
|
|
10
|
-
assert.deepStrictEqual(inspect(parser('![]{javascript:alert}')), [['<img class="invalid" alt="javascript:alert">'], '']);
|
|
11
|
-
assert.deepStrictEqual(inspect(parser('![]{vbscript:alert}')), [['<img class="invalid" alt="vbscript:alert">'], '']);
|
|
12
|
-
assert.deepStrictEqual(inspect(parser('![]{data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K}')), [['<img class="invalid" alt="data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K">'], '']);
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('![]{any:alert}')), [['<img class="invalid" alt="any:alert">'], '']);
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('![]{"}')), [['<a href=""" target="_blank"><img class="media" data-src=""" alt="""></a>'], '']);
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('![]{\\}')), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('![\\"]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="""></a>'], '']);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser('![]{javascript:alert}'), ctx), [['<img class="invalid" alt="javascript:alert">'], '']);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser('![]{vbscript:alert}'), ctx), [['<img class="invalid" alt="vbscript:alert">'], '']);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser('![]{data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K}'), ctx), [['<img class="invalid" alt="data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K">'], '']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser('![]{any:alert}'), ctx), [['<img class="invalid" alt="any:alert">'], '']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser('![]{"}'), ctx), [['<a href=""" target="_blank"><img class="media" data-src=""" alt="""></a>'], '']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('![]{\\}'), ctx), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser('![\\"]{/}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="""></a>'], '']);
|
|
17
19
|
});
|
|
18
20
|
|
|
19
21
|
it('invalid', () => {
|
|
20
|
-
assert.deepStrictEqual(inspect(parser('')), undefined);
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('{}')), undefined);
|
|
22
|
-
assert.deepStrictEqual(inspect(parser('[]')), undefined);
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('!{}')), undefined);
|
|
24
|
-
assert.deepStrictEqual(inspect(parser('![{b}')), undefined);
|
|
25
|
-
assert.deepStrictEqual(inspect(parser('![]')), undefined);
|
|
26
|
-
assert.deepStrictEqual(inspect(parser('![]{}')), undefined);
|
|
27
|
-
assert.deepStrictEqual(inspect(parser('![]{ }')),
|
|
28
|
-
assert.deepStrictEqual(inspect(parser('![]{ }')),
|
|
29
|
-
assert.deepStrictEqual(inspect(parser('![]{ }')),
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('![]]{/}')), undefined);
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('![]{{}')), undefined);
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('![]{}}')), undefined);
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('![]{{}}')), undefined);
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('![]{{b}}')), undefined);
|
|
35
|
-
assert.deepStrictEqual(inspect(parser('![]{b\nc}')),
|
|
36
|
-
assert.deepStrictEqual(inspect(parser('![]{
|
|
37
|
-
assert.deepStrictEqual(inspect(parser('![]{ b}')),
|
|
38
|
-
assert.deepStrictEqual(inspect(parser('![]{ b\n}')),
|
|
39
|
-
assert.deepStrictEqual(inspect(parser('![ ]{}')), undefined);
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('![ ]{b}')), undefined);
|
|
41
|
-
assert.deepStrictEqual(inspect(parser('![ ]{b}')), undefined);
|
|
42
|
-
assert.deepStrictEqual(inspect(parser('![\n]{b}')), undefined);
|
|
43
|
-
assert.deepStrictEqual(inspect(parser('![\\ ]{b}')), undefined);
|
|
44
|
-
assert.deepStrictEqual(inspect(parser('![\\\n]{b}')), undefined);
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('![	]{b}')), undefined);
|
|
46
|
-
assert.deepStrictEqual(inspect(parser('![&a;]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="&a;"></a>'], '']);
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('![[]{b}')), undefined);
|
|
48
|
-
assert.deepStrictEqual(inspect(parser('![]]{b}')), undefined);
|
|
49
|
-
assert.deepStrictEqual(inspect(parser('![a]{}')), undefined);
|
|
50
|
-
assert.deepStrictEqual(inspect(parser('![a\nb]{b}')), undefined);
|
|
51
|
-
assert.deepStrictEqual(inspect(parser('![a\\\nb]{b}')), undefined);
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('![]{ttp://host}')), [['<img class="invalid" alt="ttp://host">'], '']);
|
|
53
|
-
assert.deepStrictEqual(inspect(parser('![]{tel:1234567890}')), [['<img class="invalid" alt="tel:1234567890">'], '']);
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('![]{http://[::ffff:0:0%1]}')), [['<img class="invalid" alt="http://[::ffff:0:0%1]">'], '']);
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('![]{http://[::ffff:0:0/96]}')), [['<img class="invalid" alt="http://[::ffff:0:0/96]">'], '']);
|
|
56
|
-
assert.deepStrictEqual(inspect(parser('![]{.}')), [['<img class="invalid" alt=".">'], '']);
|
|
57
|
-
assert.deepStrictEqual(inspect(parser('![]{..}')), [['<img class="invalid" alt="..">'], '']);
|
|
58
|
-
assert.deepStrictEqual(inspect(parser('![]{../}')), [['<img class="invalid" alt="../">'], '']);
|
|
59
|
-
assert.deepStrictEqual(inspect(parser('![]{/../b}')), [['<img class="invalid" alt="/../b">'], '']);
|
|
60
|
-
assert.deepStrictEqual(inspect(parser(' ![]{b}')), undefined);
|
|
61
|
-
assert.deepStrictEqual(inspect(parser('[]{/}')), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser('{}'), ctx), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser('[]'), ctx), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser('!{}'), ctx), undefined);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser('![{b}'), ctx), undefined);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser('![]'), ctx), undefined);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser('![]{}'), ctx), undefined);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser('![]{ }'), ctx), [['<span class="invalid">![]{ }</span>'], '']);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser('![]{ }'), ctx), [['<span class="invalid">![]{ }</span>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser('![]{ }'), ctx), [['<span class="invalid">![]{ }</span>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser('![]]{/}'), ctx), undefined);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser('![]{{}'), ctx), undefined);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser('![]{}}'), ctx), undefined);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser('![]{{}}'), ctx), undefined);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser('![]{{b}}'), ctx), undefined);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser('![]{b\nc}'), ctx), [['<span class="invalid">![]{b</span>'], '\nc}']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser('![]{b\\\nc}'), ctx), [['<span class="invalid">![]{b\\</span>'], '\nc}']);
|
|
39
|
+
assert.deepStrictEqual(inspect(parser('![]{ b}'), ctx), [['<span class="invalid">![]{ b}</span>'], '']);
|
|
40
|
+
assert.deepStrictEqual(inspect(parser('![]{ b\n}'), ctx), [['<span class="invalid">![]{ b</span>'], '\n}']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser('![ ]{}'), ctx), undefined);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser('![ ]{b}'), ctx), undefined);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser('![ ]{b}'), ctx), undefined);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser('![\n]{b}'), ctx), undefined);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser('![\\ ]{b}'), ctx), undefined);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser('![\\\n]{b}'), ctx), undefined);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser('![	]{b}'), ctx), undefined);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser('![&a;]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="&a;"></a>'], '']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser('![[]{b}'), ctx), undefined);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser('![]]{b}'), ctx), undefined);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser('![a]{}'), ctx), undefined);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser('![a\nb]{b}'), ctx), undefined);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser('![a\\\nb]{b}'), ctx), undefined);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser('![]{ttp://host}'), ctx), [['<img class="invalid" alt="ttp://host">'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser('![]{tel:1234567890}'), ctx), [['<img class="invalid" alt="tel:1234567890">'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser('![]{http://[::ffff:0:0%1]}'), ctx), [['<img class="invalid" alt="http://[::ffff:0:0%1]">'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser('![]{http://[::ffff:0:0/96]}'), ctx), [['<img class="invalid" alt="http://[::ffff:0:0/96]">'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser('![]{.}'), ctx), [['<img class="invalid" alt=".">'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser('![]{..}'), ctx), [['<img class="invalid" alt="..">'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser('![]{../}'), ctx), [['<img class="invalid" alt="../">'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser('![]{/../b}'), ctx), [['<img class="invalid" alt="/../b">'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser(' ![]{b}'), ctx), undefined);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser('[]{/}'), ctx), undefined);
|
|
62
64
|
});
|
|
63
65
|
|
|
64
66
|
it('basic', () => {
|
|
65
|
-
assert.deepStrictEqual(inspect(parser('![]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
66
|
-
assert.deepStrictEqual(inspect(parser('![]{b }')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
67
|
-
assert.deepStrictEqual(inspect(parser('![]{b }')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
68
|
-
assert.deepStrictEqual(inspect(parser('![]{ b }')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
69
|
-
assert.deepStrictEqual(inspect(parser('![]{ b }')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
70
|
-
assert.deepStrictEqual(inspect(parser('![]{ b }')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
71
|
-
assert.deepStrictEqual(inspect(parser('![]{ b }')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
72
|
-
assert.deepStrictEqual(inspect(parser('![]{ b }')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
73
|
-
assert.deepStrictEqual(inspect(parser('![]{"}')), [['<a href=""" target="_blank"><img class="media" data-src=""" alt="""></a>'], '']);
|
|
74
|
-
assert.deepStrictEqual(inspect(parser('![]{"}"}')), [['<a href=""" target="_blank"><img class="media" data-src=""" alt="""></a>'], '"}']);
|
|
75
|
-
assert.deepStrictEqual(inspect(parser('![]{\\}')), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
|
|
76
|
-
assert.deepStrictEqual(inspect(parser('![]{\\ }')), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
|
|
77
|
-
assert.deepStrictEqual(inspect(parser('![]{\\b}')), [['<a href="\\b" target="_blank"><img class="media" data-src="\\b" alt="\\b"></a>'], '']);
|
|
78
|
-
assert.deepStrictEqual(inspect(parser('![]{?/../}')), [[`<a href="?/../" target="_blank"><img class="media" data-src="?/../" alt="?/../"></a>`], '']);
|
|
79
|
-
assert.deepStrictEqual(inspect(parser('![]{#/../}')), [[`<a href="#/../" target="_blank"><img class="media" data-src="#/../" alt="#/../"></a>`], '']);
|
|
80
|
-
assert.deepStrictEqual(inspect(parser('![]{^/b}')), [[`<a href="/b" target="_blank"><img class="media" data-src="/b" alt="^/b"></a>`], '']);
|
|
81
|
-
assert.deepStrictEqual(inspect(parser('![ a]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
|
|
82
|
-
assert.deepStrictEqual(inspect(parser('![ a ]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
|
|
83
|
-
assert.deepStrictEqual(inspect(parser('![a ]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
|
|
84
|
-
assert.deepStrictEqual(inspect(parser('![a ]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
|
|
85
|
-
assert.deepStrictEqual(inspect(parser('![a b]{c}')), [['<a href="c" target="_blank"><img class="media" data-src="c" alt="a b"></a>'], '']);
|
|
86
|
-
assert.deepStrictEqual(inspect(parser('![©]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="©"></a>'], '']);
|
|
87
|
-
assert.deepStrictEqual(inspect(parser('![&copy;]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="&copy;"></a>'], '']);
|
|
88
|
-
assert.deepStrictEqual(inspect(parser('!{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
89
|
-
assert.deepStrictEqual(inspect(parser('!{ ][ }')), [['<a href="][" target="_blank"><img class="media" data-src="][" alt="]["></a>'], '']);
|
|
90
|
-
assert.deepStrictEqual(inspect(parser('!{ }{ }')), [['<a href="}{" target="_blank"><img class="media" data-src="}{" alt="}{"></a>'], '']);
|
|
67
|
+
assert.deepStrictEqual(inspect(parser('![]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
68
|
+
assert.deepStrictEqual(inspect(parser('![]{b }'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
69
|
+
assert.deepStrictEqual(inspect(parser('![]{b }'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
70
|
+
assert.deepStrictEqual(inspect(parser('![]{ b }'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
71
|
+
assert.deepStrictEqual(inspect(parser('![]{ b }'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
72
|
+
assert.deepStrictEqual(inspect(parser('![]{ b }'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
73
|
+
assert.deepStrictEqual(inspect(parser('![]{ b }'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
74
|
+
assert.deepStrictEqual(inspect(parser('![]{ b }'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
75
|
+
assert.deepStrictEqual(inspect(parser('![]{"}'), ctx), [['<a href=""" target="_blank"><img class="media" data-src=""" alt="""></a>'], '']);
|
|
76
|
+
assert.deepStrictEqual(inspect(parser('![]{"}"}'), ctx), [['<a href=""" target="_blank"><img class="media" data-src=""" alt="""></a>'], '"}']);
|
|
77
|
+
assert.deepStrictEqual(inspect(parser('![]{\\}'), ctx), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
|
|
78
|
+
assert.deepStrictEqual(inspect(parser('![]{\\ }'), ctx), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
|
|
79
|
+
assert.deepStrictEqual(inspect(parser('![]{\\b}'), ctx), [['<a href="\\b" target="_blank"><img class="media" data-src="\\b" alt="\\b"></a>'], '']);
|
|
80
|
+
assert.deepStrictEqual(inspect(parser('![]{?/../}'), ctx), [[`<a href="?/../" target="_blank"><img class="media" data-src="?/../" alt="?/../"></a>`], '']);
|
|
81
|
+
assert.deepStrictEqual(inspect(parser('![]{#/../}'), ctx), [[`<a href="#/../" target="_blank"><img class="media" data-src="#/../" alt="#/../"></a>`], '']);
|
|
82
|
+
assert.deepStrictEqual(inspect(parser('![]{^/b}'), ctx), [[`<a href="/b" target="_blank"><img class="media" data-src="/b" alt="^/b"></a>`], '']);
|
|
83
|
+
assert.deepStrictEqual(inspect(parser('![ a]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
|
|
84
|
+
assert.deepStrictEqual(inspect(parser('![ a ]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
|
|
85
|
+
assert.deepStrictEqual(inspect(parser('![a ]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
|
|
86
|
+
assert.deepStrictEqual(inspect(parser('![a ]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
|
|
87
|
+
assert.deepStrictEqual(inspect(parser('![a b]{c}'), ctx), [['<a href="c" target="_blank"><img class="media" data-src="c" alt="a b"></a>'], '']);
|
|
88
|
+
assert.deepStrictEqual(inspect(parser('![©]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="©"></a>'], '']);
|
|
89
|
+
assert.deepStrictEqual(inspect(parser('![&copy;]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="&copy;"></a>'], '']);
|
|
90
|
+
assert.deepStrictEqual(inspect(parser('!{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
91
|
+
assert.deepStrictEqual(inspect(parser('!{ ][ }'), ctx), [['<a href="][" target="_blank"><img class="media" data-src="][" alt="]["></a>'], '']);
|
|
92
|
+
assert.deepStrictEqual(inspect(parser('!{ }{ }'), ctx), [['<a href="}{" target="_blank"><img class="media" data-src="}{" alt="}{"></a>'], '']);
|
|
91
93
|
});
|
|
92
94
|
|
|
93
95
|
it('nest', () => {
|
|
94
|
-
assert.deepStrictEqual(inspect(parser('![\\[]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="["></a>'], '']);
|
|
95
|
-
assert.deepStrictEqual(inspect(parser('![\\"]{"?"#"}')), [['<a href=""?"#"" target="_blank"><img class="media" data-src=""?"#"" alt="""></a>'], '']);
|
|
96
|
-
assert.deepStrictEqual(inspect(parser('![*a*]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="*a*"></a>'], '']);
|
|
97
|
-
assert.deepStrictEqual(inspect(parser('![<wbr>]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="<wbr>"></a>'], '']);
|
|
96
|
+
assert.deepStrictEqual(inspect(parser('![\\[]{/}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="["></a>'], '']);
|
|
97
|
+
assert.deepStrictEqual(inspect(parser('![\\"]{"?"#"}'), ctx), [['<a href=""?"#"" target="_blank"><img class="media" data-src=""?"#"" alt="""></a>'], '']);
|
|
98
|
+
assert.deepStrictEqual(inspect(parser('![*a*]{/}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="*a*"></a>'], '']);
|
|
99
|
+
assert.deepStrictEqual(inspect(parser('![<wbr>]{/}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="<wbr>"></a>'], '']);
|
|
98
100
|
});
|
|
99
101
|
|
|
100
102
|
it('external', () => {
|
|
101
|
-
assert.deepStrictEqual(inspect(parser('![]{//host}')), [['<a href="//host" target="_blank"><img class="media" data-src="//host" alt="//host"></a>'], '']);
|
|
102
|
-
assert.deepStrictEqual(inspect(parser('![]{//[::]}')), [['<a href="//[::]" target="_blank"><img class="media" data-src="//[::]" alt="//[::]"></a>'], '']);
|
|
103
|
+
assert.deepStrictEqual(inspect(parser('![]{//host}'), ctx), [['<a href="//host" target="_blank"><img class="media" data-src="//host" alt="//host"></a>'], '']);
|
|
104
|
+
assert.deepStrictEqual(inspect(parser('![]{//[::]}'), ctx), [['<a href="//[::]" target="_blank"><img class="media" data-src="//[::]" alt="//[::]"></a>'], '']);
|
|
103
105
|
});
|
|
104
106
|
|
|
105
107
|
it('attribute', () => {
|
|
106
|
-
assert.deepStrictEqual(inspect(parser('![]{/ __proto__}')), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
|
|
107
|
-
assert.deepStrictEqual(inspect(parser('![]{/ constructor}')), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
|
|
108
|
-
assert.deepStrictEqual(inspect(parser('![]{/ aspect-ratio}')), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
|
|
109
|
-
assert.deepStrictEqual(inspect(parser('![]{/ nofollow}')), [['<a href="/" rel="nofollow" target="_blank"><img class="media" data-src="/" alt="/"></a>'], '']);
|
|
110
|
-
assert.deepStrictEqual(inspect(parser('![]{/ width="4" height="3"}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" width="4" height="3"></a>'], '']);
|
|
111
|
-
assert.deepStrictEqual(inspect(parser('![]{/ 4x3}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" width="4" height="3"></a>'], '']);
|
|
112
|
-
assert.deepStrictEqual(inspect(parser('![]{/ aspect-ratio="4/3"}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" aspect-ratio="4/3" style="aspect-ratio: 4 / 3;"></a>'], '']);
|
|
113
|
-
assert.deepStrictEqual(inspect(parser('![]{/ aspect-ratio="4/3" nofollow}')), [['<a href="/" rel="nofollow" target="_blank"><img class="media" data-src="/" alt="/" aspect-ratio="4/3" style="aspect-ratio: 4 / 3;"></a>'], '']);
|
|
114
|
-
assert.deepStrictEqual(inspect(parser('![]{/ 4:3}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" aspect-ratio="4/3" style="aspect-ratio: 4 / 3;"></a>'], '']);
|
|
108
|
+
assert.deepStrictEqual(inspect(parser('![]{/ __proto__}'), ctx), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
|
|
109
|
+
assert.deepStrictEqual(inspect(parser('![]{/ constructor}'), ctx), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
|
|
110
|
+
assert.deepStrictEqual(inspect(parser('![]{/ aspect-ratio}'), ctx), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
|
|
111
|
+
assert.deepStrictEqual(inspect(parser('![]{/ nofollow}'), ctx), [['<a href="/" rel="nofollow" target="_blank"><img class="media" data-src="/" alt="/"></a>'], '']);
|
|
112
|
+
assert.deepStrictEqual(inspect(parser('![]{/ width="4" height="3"}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" width="4" height="3"></a>'], '']);
|
|
113
|
+
assert.deepStrictEqual(inspect(parser('![]{/ 4x3}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" width="4" height="3"></a>'], '']);
|
|
114
|
+
assert.deepStrictEqual(inspect(parser('![]{/ aspect-ratio="4/3"}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" aspect-ratio="4/3" style="aspect-ratio: 4 / 3;"></a>'], '']);
|
|
115
|
+
assert.deepStrictEqual(inspect(parser('![]{/ aspect-ratio="4/3" nofollow}'), ctx), [['<a href="/" rel="nofollow" target="_blank"><img class="media" data-src="/" alt="/" aspect-ratio="4/3" style="aspect-ratio: 4 / 3;"></a>'], '']);
|
|
116
|
+
assert.deepStrictEqual(inspect(parser('![]{/ 4:3}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" aspect-ratio="4/3" style="aspect-ratio: 4 / 3;"></a>'], '']);
|
|
115
117
|
});
|
|
116
118
|
|
|
117
119
|
});
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { MediaParser } from '../inline';
|
|
2
|
-
import { State, Recursion, Backtrack } from '../context';
|
|
3
|
-
import {
|
|
2
|
+
import { State, Recursion, Backtrack, Command } from '../context';
|
|
3
|
+
import { subinput } from '../../combinator/data/parser';
|
|
4
|
+
import { union, inits, tails, some, creation, recursion, precedence, constraint, validate, verify, surround, open, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
|
|
4
5
|
import { unsafelink, uri, option as linkoption, resolve, decode } from './link';
|
|
5
6
|
import { attributes } from './html';
|
|
6
7
|
import { unsafehtmlentity } from './htmlentity';
|
|
7
8
|
import { txt, linebreak, str } from '../source';
|
|
8
9
|
import { invalid } from '../util';
|
|
9
10
|
import { ReadonlyURL } from 'spica/url';
|
|
11
|
+
import { unshift, push } from 'spica/array';
|
|
10
12
|
import { html, define } from 'typed-dom/dom';
|
|
11
13
|
|
|
12
14
|
const optspec = {
|
|
@@ -29,9 +31,9 @@ export const media: MediaParser = lazy(() => constraint(State.media, validate(['
|
|
|
29
31
|
]), ']')),
|
|
30
32
|
']',
|
|
31
33
|
true,
|
|
32
|
-
([, ns = []],
|
|
34
|
+
([, ns = []], context) =>
|
|
33
35
|
context.linebreak === 0
|
|
34
|
-
? [ns
|
|
36
|
+
? [ns]
|
|
35
37
|
: undefined,
|
|
36
38
|
undefined,
|
|
37
39
|
[3 | Backtrack.escbracket])),
|
|
@@ -39,12 +41,30 @@ export const media: MediaParser = lazy(() => constraint(State.media, validate(['
|
|
|
39
41
|
/^{(?![{}])/,
|
|
40
42
|
inits([uri, some(option)]),
|
|
41
43
|
/^[^\S\n]*}/,
|
|
42
|
-
false,
|
|
44
|
+
false,
|
|
45
|
+
undefined,
|
|
46
|
+
([as, bs], context) => {
|
|
47
|
+
if (!bs) return;
|
|
48
|
+
const head = context.position - context.range!;
|
|
49
|
+
setBacktrack(context, [2 | Backtrack.link], head);
|
|
50
|
+
return [push(unshift(as, bs), [Command.Cancel])];
|
|
51
|
+
},
|
|
43
52
|
[3 | Backtrack.link])),
|
|
44
53
|
]),
|
|
45
54
|
([as, bs]) => bs ? [[as.join('').trim() || as.join('')], bs] : [[''], as]),
|
|
46
55
|
([[text]]) => text === '' || text.trim() !== ''),
|
|
47
|
-
([[text], params],
|
|
56
|
+
([[text], params], context) => {
|
|
57
|
+
if (params.at(-1) === Command.Cancel) {
|
|
58
|
+
params.pop();
|
|
59
|
+
return [[
|
|
60
|
+
html('span',
|
|
61
|
+
{
|
|
62
|
+
class: 'invalid',
|
|
63
|
+
...invalid('media', 'syntax', 'Missing the closing symbol "}"')
|
|
64
|
+
},
|
|
65
|
+
'!' + context.source.slice(context.position - context.range!, context.position))
|
|
66
|
+
]];
|
|
67
|
+
}
|
|
48
68
|
assert(text === text.trim());
|
|
49
69
|
const INSECURE_URI = params.shift()!;
|
|
50
70
|
assert(INSECURE_URI === INSECURE_URI.trim());
|
|
@@ -65,7 +85,7 @@ export const media: MediaParser = lazy(() => constraint(State.media, validate(['
|
|
|
65
85
|
|| html('img', { class: 'media', 'data-src': uri?.source });
|
|
66
86
|
assert(!el.matches('.invalid'));
|
|
67
87
|
el.setAttribute('alt', text);
|
|
68
|
-
if (!sanitize(el, uri)) return [[el]
|
|
88
|
+
if (!sanitize(el, uri)) return [[el]];
|
|
69
89
|
assert(!el.matches('.invalid'));
|
|
70
90
|
define(el, attributes('media', optspec, params));
|
|
71
91
|
assert(el.matches('img') || !el.matches('.invalid'));
|
|
@@ -73,12 +93,17 @@ export const media: MediaParser = lazy(() => constraint(State.media, validate(['
|
|
|
73
93
|
if (el.hasAttribute('aspect-ratio')) {
|
|
74
94
|
el.style.aspectRatio = el.getAttribute('aspect-ratio')!;
|
|
75
95
|
}
|
|
76
|
-
if (context.state! & State.link) return [[el]
|
|
77
|
-
if (cache && cache.tagName !== 'IMG') return [[el]
|
|
96
|
+
if (context.state! & State.link) return [[el]];
|
|
97
|
+
if (cache && cache.tagName !== 'IMG') return [[el]];
|
|
98
|
+
const { source, position } = context;
|
|
78
99
|
return fmap(
|
|
79
100
|
unsafelink as MediaParser,
|
|
80
|
-
([link]) =>
|
|
81
|
-
|
|
101
|
+
([link]) => {
|
|
102
|
+
context.source = source;
|
|
103
|
+
context.position = position;
|
|
104
|
+
return [define(link, { class: null, target: '_blank' }, [el])];
|
|
105
|
+
})
|
|
106
|
+
(subinput(`{ ${INSECURE_URI}${params.join('')} }`, context));
|
|
82
107
|
}))))));
|
|
83
108
|
|
|
84
109
|
export const linemedia: MediaParser.LineMediaParser = surround(
|
|
@@ -88,13 +113,13 @@ export const linemedia: MediaParser.LineMediaParser = surround(
|
|
|
88
113
|
|
|
89
114
|
const bracket: MediaParser.TextParser.BracketParser = lazy(() => recursion(Recursion.terminal, union([
|
|
90
115
|
surround(str('('), some(union([unsafehtmlentity, bracket, txt]), ')'), str(')'), true,
|
|
91
|
-
undefined, () => [[]
|
|
116
|
+
undefined, () => [[]], [3 | Backtrack.escbracket]),
|
|
92
117
|
surround(str('['), some(union([unsafehtmlentity, bracket, txt]), ']'), str(']'), true,
|
|
93
|
-
undefined, () => [[]
|
|
118
|
+
undefined, () => [[]], [3 | Backtrack.escbracket]),
|
|
94
119
|
surround(str('{'), some(union([unsafehtmlentity, bracket, txt]), '}'), str('}'), true,
|
|
95
|
-
undefined, () => [[]
|
|
120
|
+
undefined, () => [[]], [3 | Backtrack.escbracket]),
|
|
96
121
|
surround(str('"'), precedence(2, some(union([unsafehtmlentity, txt]), '"')), str('"'), true,
|
|
97
|
-
undefined, () => [[]
|
|
122
|
+
undefined, () => [[]], [3 | Backtrack.escbracket]),
|
|
98
123
|
])));
|
|
99
124
|
|
|
100
125
|
const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([
|
|
@@ -103,11 +128,10 @@ const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([
|
|
|
103
128
|
str(/^[x:]/),
|
|
104
129
|
str(/^[1-9][0-9]*(?=[^\S\n]|})/),
|
|
105
130
|
false,
|
|
106
|
-
([[a], [b], [c]]
|
|
131
|
+
([[a], [b], [c]]) => [
|
|
107
132
|
b === 'x'
|
|
108
133
|
? [`width="${a}"`, `height="${c}"`]
|
|
109
134
|
: [`aspect-ratio="${a}/${c}"`],
|
|
110
|
-
rest
|
|
111
135
|
]),
|
|
112
136
|
linkoption,
|
|
113
137
|
]));
|