securemark 0.299.4 → 0.300.1
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 +2847 -1993
- 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 +35 -0
- package/src/combinator/control/sequence.test.ts +38 -0
- package/src/combinator/control/sequence.ts +19 -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 +33 -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 +31 -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 +303 -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 +273 -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 +54 -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 +7 -9
- package/src/parser/block/extension/aside.ts +76 -47
- package/src/parser/block/extension/example.test.ts +16 -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 +58 -63
- package/src/parser/block/extension/figure.ts +23 -21
- package/src/parser/block/extension/message.test.ts +12 -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 +69 -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 +29 -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 +40 -40
- 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 +17 -18
- 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 +7 -8
- package/src/parser/inline/media.test.ts +92 -93
- package/src/parser/inline/media.ts +35 -41
- 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 +100 -52
- 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 +17 -20
- 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 +19 -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 +32 -62
- package/src/parser/source/unescapable.test.ts +23 -24
- package/src/parser/source/unescapable.ts +15 -16
- package/src/parser/source/whitespace.ts +36 -0
- package/src/parser/source.ts +1 -0
- package/src/parser/util.ts +1 -1
- package/src/parser/visibility.ts +37 -15
- 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,7 @@
|
|
|
1
1
|
import { MathParser } from '../inline';
|
|
2
2
|
import { Backtrack, Recursion } from '../context';
|
|
3
|
-
import {
|
|
4
|
-
import { union, some, recursion, precedence, rewrite, surround, lazy } from '../../combinator';
|
|
3
|
+
import { Node } from '../../combinator/parser';
|
|
4
|
+
import { union, some, recursion, precedence, backtrack, rewrite, surround, lazy } from '../../combinator';
|
|
5
5
|
import { escsource, str } from '../source';
|
|
6
6
|
import { invalid } from '../util';
|
|
7
7
|
import { html } from 'typed-dom/dom';
|
|
@@ -26,7 +26,7 @@ export const math: MathParser = lazy(() => rewrite(
|
|
|
26
26
|
false,
|
|
27
27
|
[3 | Backtrack.escapable]),
|
|
28
28
|
]),
|
|
29
|
-
({ source, caches: { math: cache } = {} }) =>
|
|
29
|
+
({ source, caches: { math: cache } = {} }, output) => output.append(
|
|
30
30
|
new Node(cache?.get(source)?.cloneNode(true) ||
|
|
31
31
|
html('span',
|
|
32
32
|
!forbiddenCommand.test(source)
|
|
@@ -37,15 +37,14 @@ export const math: MathParser = lazy(() => rewrite(
|
|
|
37
37
|
...invalid('math', 'content',
|
|
38
38
|
`"${source.match(forbiddenCommand)![0]}" command is forbidden`),
|
|
39
39
|
},
|
|
40
|
-
source))
|
|
41
|
-
])));
|
|
40
|
+
source)))));
|
|
42
41
|
|
|
43
|
-
const bracket: MathParser.BracketParser = lazy(() => surround(
|
|
42
|
+
const bracket: MathParser.BracketParser = lazy(() => backtrack(surround(
|
|
44
43
|
str('{'),
|
|
45
|
-
recursion(Recursion.
|
|
44
|
+
recursion(Recursion.bracket,
|
|
46
45
|
some(union([
|
|
47
46
|
bracket,
|
|
48
47
|
some(escsource, /[{}$\r\n]|(?<=[0-9A-Za-z]):\/\/[[0-9A-Za-z]/y),
|
|
49
48
|
]))),
|
|
50
49
|
str('}'),
|
|
51
|
-
true));
|
|
50
|
+
true)));
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { media } from './media';
|
|
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/media', () => {
|
|
@@ -9,112 +8,112 @@ describe('Unit: parser/inline/media', () => {
|
|
|
9
8
|
const parser = some(media);
|
|
10
9
|
|
|
11
10
|
it('xss', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser, input('![]{javascript:alert}'
|
|
13
|
-
assert.deepStrictEqual(inspect(parser, input('![]{vbscript:alert}'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser, input('![]{data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K}'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser, input('![]{any:alert}'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser, input('![]{"}'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser, input('![]{\\}'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser, input('![\\"]{/}'
|
|
11
|
+
assert.deepStrictEqual(inspect(parser, input('![]{javascript:alert}')), [['<img class="invalid" alt="javascript:alert">'], '']);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('![]{vbscript:alert}')), [['<img class="invalid" alt="vbscript:alert">'], '']);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('![]{data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K}')), [['<img class="invalid" alt="data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K">'], '']);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('![]{any:alert}')), [['<img class="invalid" alt="any:alert">'], '']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('![]{"}')), [['<a href=""" target="_blank"><img class="media" data-src=""" alt="""></a>'], '']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('![]{\\}')), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('![\\"]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="""></a>'], '']);
|
|
19
18
|
});
|
|
20
19
|
|
|
21
20
|
it('invalid', () => {
|
|
22
|
-
assert.deepStrictEqual(inspect(parser, input(''
|
|
23
|
-
assert.deepStrictEqual(inspect(parser, input('{}'
|
|
24
|
-
assert.deepStrictEqual(inspect(parser, input('[]'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser, input('!{}'
|
|
26
|
-
assert.deepStrictEqual(inspect(parser, input('![{b}'
|
|
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('![]{ }'
|
|
32
|
-
assert.deepStrictEqual(inspect(parser, input('![]]{/}'
|
|
33
|
-
assert.deepStrictEqual(inspect(parser, input('![]{{}'
|
|
34
|
-
assert.deepStrictEqual(inspect(parser, input('![]{}}'
|
|
35
|
-
assert.deepStrictEqual(inspect(parser, input('![]{{}}'
|
|
36
|
-
assert.deepStrictEqual(inspect(parser, input('![]{{b}}'
|
|
37
|
-
assert.deepStrictEqual(inspect(parser, input('![]{b\nc}'
|
|
38
|
-
assert.deepStrictEqual(inspect(parser, input('![]{b\\\nc}'
|
|
39
|
-
assert.deepStrictEqual(inspect(parser, input('![]{ b}'
|
|
40
|
-
assert.deepStrictEqual(inspect(parser, input('![]{ b\n}'
|
|
41
|
-
assert.deepStrictEqual(inspect(parser, input('![ ]{}'
|
|
42
|
-
assert.deepStrictEqual(inspect(parser, input('![ ]{b}'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser, input('![ ]{b}'
|
|
44
|
-
assert.deepStrictEqual(inspect(parser, input('![ a]{b}'
|
|
45
|
-
assert.deepStrictEqual(inspect(parser, input('![ a ]{b}'
|
|
46
|
-
assert.deepStrictEqual(inspect(parser, input('![\\ a]{b}'
|
|
47
|
-
assert.deepStrictEqual(inspect(parser, input('![ \\ a]{b}'
|
|
48
|
-
assert.deepStrictEqual(inspect(parser, input('![\n]{b}'
|
|
49
|
-
assert.deepStrictEqual(inspect(parser, input('![\\ ]{b}'
|
|
50
|
-
assert.deepStrictEqual(inspect(parser, input('![\\\n]{b}'
|
|
51
|
-
assert.deepStrictEqual(inspect(parser, input('![	]{b}'
|
|
52
|
-
assert.deepStrictEqual(inspect(parser, input('![&a;]{b}'
|
|
53
|
-
assert.deepStrictEqual(inspect(parser, input('![[]{b}'
|
|
54
|
-
assert.deepStrictEqual(inspect(parser, input('![]]{b}'
|
|
55
|
-
assert.deepStrictEqual(inspect(parser, input('![a]{}'
|
|
56
|
-
assert.deepStrictEqual(inspect(parser, input('![a\nb]{b}'
|
|
57
|
-
assert.deepStrictEqual(inspect(parser, input('![a\\\nb]{b}'
|
|
58
|
-
assert.deepStrictEqual(inspect(parser, input('![]{ttp://host}'
|
|
59
|
-
assert.deepStrictEqual(inspect(parser, input('![]{tel:1234567890}'
|
|
60
|
-
assert.deepStrictEqual(inspect(parser, input('![]{http://[::ffff:0:0%1]}'
|
|
61
|
-
assert.deepStrictEqual(inspect(parser, input('![]{http://[::ffff:0:0/96]}'
|
|
62
|
-
assert.deepStrictEqual(inspect(parser, input('![]{.}'
|
|
63
|
-
assert.deepStrictEqual(inspect(parser, input('![]{..}'
|
|
64
|
-
assert.deepStrictEqual(inspect(parser, input('![]{../}'
|
|
65
|
-
assert.deepStrictEqual(inspect(parser, input('![]{/../b}'
|
|
66
|
-
assert.deepStrictEqual(inspect(parser, input(' ![]{b}'
|
|
67
|
-
assert.deepStrictEqual(inspect(parser, input('[]{/}'
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('')), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('{}')), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('[]')), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('!{}')), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('![{b}')), undefined);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input('![]')), undefined);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser, input('![]{}')), undefined);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser, input('![]{ }')), [['<span class="invalid">![]{ }</span>'], '']);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser, input('![]{ }')), undefined);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser, input('![]{ }')), undefined);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser, input('![]]{/}')), undefined);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser, input('![]{{}')), undefined);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser, input('![]{}}')), undefined);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('![]{{}}')), undefined);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('![]{{b}}')), undefined);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser, input('![]{b\nc}')), [['<span class="invalid">![]{b</span>'], '\nc}']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser, input('![]{b\\\nc}')), [['<span class="invalid">![]{b\\</span>'], '\nc}']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser, input('![]{ b}')), [['<span class="invalid">![]{ b}</span>'], '']);
|
|
39
|
+
assert.deepStrictEqual(inspect(parser, input('![]{ b\n}')), [['<span class="invalid">![]{ b</span>'], '\n}']);
|
|
40
|
+
assert.deepStrictEqual(inspect(parser, input('![ ]{}')), undefined);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser, input('![ ]{b}')), undefined);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('![ ]{b}')), undefined);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser, input('![ a]{b}')), undefined);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser, input('![ a ]{b}')), undefined);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser, input('![\\ a]{b}')), undefined);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser, input('![ \\ a]{b}')), undefined);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser, input('![\n]{b}')), undefined);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser, input('![\\ ]{b}')), undefined);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser, input('![\\\n]{b}')), undefined);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser, input('![	]{b}')), undefined);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser, input('![&a;]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="&a;"></a>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser, input('![[]{b}')), undefined);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser, input('![]]{b}')), undefined);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser, input('![a]{}')), undefined);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser, input('![a\nb]{b}')), undefined);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser, input('![a\\\nb]{b}')), undefined);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser, input('![]{ttp://host}')), [['<img class="invalid" alt="ttp://host">'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser, input('![]{tel:1234567890}')), [['<img class="invalid" alt="tel:1234567890">'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser, input('![]{http://[::ffff:0:0%1]}')), [['<img class="invalid" alt="http://[::ffff:0:0%1]">'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser, input('![]{http://[::ffff:0:0/96]}')), [['<img class="invalid" alt="http://[::ffff:0:0/96]">'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser, input('![]{.}')), [['<img class="invalid" alt=".">'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser, input('![]{..}')), [['<img class="invalid" alt="..">'], '']);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser, input('![]{../}')), [['<img class="invalid" alt="../">'], '']);
|
|
64
|
+
assert.deepStrictEqual(inspect(parser, input('![]{/../b}')), [['<img class="invalid" alt="/../b">'], '']);
|
|
65
|
+
assert.deepStrictEqual(inspect(parser, input(' ![]{b}')), undefined);
|
|
66
|
+
assert.deepStrictEqual(inspect(parser, input('[]{/}')), undefined);
|
|
68
67
|
});
|
|
69
68
|
|
|
70
69
|
it('basic', () => {
|
|
71
|
-
assert.deepStrictEqual(inspect(parser, input('![]{b}'
|
|
72
|
-
assert.deepStrictEqual(inspect(parser, input('![]{b }'
|
|
73
|
-
assert.deepStrictEqual(inspect(parser, input('![]{b }'
|
|
74
|
-
assert.deepStrictEqual(inspect(parser, input('![]{ b }'
|
|
75
|
-
assert.deepStrictEqual(inspect(parser, input('![]{ b }'
|
|
76
|
-
assert.deepStrictEqual(inspect(parser, input('![]{ b }'
|
|
77
|
-
assert.deepStrictEqual(inspect(parser, input('![]{ b }'
|
|
78
|
-
assert.deepStrictEqual(inspect(parser, input('![]{"}'
|
|
79
|
-
assert.deepStrictEqual(inspect(parser, input('![]{"}"}'
|
|
80
|
-
assert.deepStrictEqual(inspect(parser, input('![]{\\}'
|
|
81
|
-
assert.deepStrictEqual(inspect(parser, input('![]{\\ }'
|
|
82
|
-
assert.deepStrictEqual(inspect(parser, input('![]{\\b}'
|
|
83
|
-
assert.deepStrictEqual(inspect(parser, input('![]{?/../}'
|
|
84
|
-
assert.deepStrictEqual(inspect(parser, input('![]{#/../}'
|
|
85
|
-
assert.deepStrictEqual(inspect(parser, input('![]{^/b}'
|
|
86
|
-
assert.deepStrictEqual(inspect(parser, input('![a ]{b}'
|
|
87
|
-
assert.deepStrictEqual(inspect(parser, input('![a ]{b}'
|
|
88
|
-
assert.deepStrictEqual(inspect(parser, input('![a b]{c}'
|
|
89
|
-
assert.deepStrictEqual(inspect(parser, input('![©]{b}'
|
|
90
|
-
assert.deepStrictEqual(inspect(parser, input('![&copy;]{b}'
|
|
91
|
-
assert.deepStrictEqual(inspect(parser, input('!{b}'
|
|
92
|
-
assert.deepStrictEqual(inspect(parser, input('!{ ][ }'
|
|
93
|
-
assert.deepStrictEqual(inspect(parser, input('!{ }{ }'
|
|
70
|
+
assert.deepStrictEqual(inspect(parser, input('![]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
71
|
+
assert.deepStrictEqual(inspect(parser, input('![]{b }')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
72
|
+
assert.deepStrictEqual(inspect(parser, input('![]{b }')), [['<span class="invalid">![]{b</span>'], ' }']);
|
|
73
|
+
assert.deepStrictEqual(inspect(parser, input('![]{ b }')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
74
|
+
assert.deepStrictEqual(inspect(parser, input('![]{ b }')), [['<span class="invalid">![]{ b</span>'], ' }']);
|
|
75
|
+
assert.deepStrictEqual(inspect(parser, input('![]{ b }')), undefined);
|
|
76
|
+
assert.deepStrictEqual(inspect(parser, input('![]{ b }')), undefined);
|
|
77
|
+
assert.deepStrictEqual(inspect(parser, input('![]{"}')), [['<a href=""" target="_blank"><img class="media" data-src=""" alt="""></a>'], '']);
|
|
78
|
+
assert.deepStrictEqual(inspect(parser, input('![]{"}"}')), [['<a href=""" target="_blank"><img class="media" data-src=""" alt="""></a>'], '"}']);
|
|
79
|
+
assert.deepStrictEqual(inspect(parser, input('![]{\\}')), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
|
|
80
|
+
assert.deepStrictEqual(inspect(parser, input('![]{\\ }')), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
|
|
81
|
+
assert.deepStrictEqual(inspect(parser, input('![]{\\b}')), [['<a href="\\b" target="_blank"><img class="media" data-src="\\b" alt="\\b"></a>'], '']);
|
|
82
|
+
assert.deepStrictEqual(inspect(parser, input('![]{?/../}')), [[`<a href="?/../" target="_blank"><img class="media" data-src="?/../" alt="?/../"></a>`], '']);
|
|
83
|
+
assert.deepStrictEqual(inspect(parser, input('![]{#/../}')), [[`<a href="#/../" target="_blank"><img class="media" data-src="#/../" alt="#/../"></a>`], '']);
|
|
84
|
+
assert.deepStrictEqual(inspect(parser, input('![]{^/b}')), [[`<a href="/b" target="_blank"><img class="media" data-src="/b" alt="^/b"></a>`], '']);
|
|
85
|
+
assert.deepStrictEqual(inspect(parser, input('![a ]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
|
|
86
|
+
assert.deepStrictEqual(inspect(parser, input('![a ]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
|
|
87
|
+
assert.deepStrictEqual(inspect(parser, input('![a b]{c}')), [['<a href="c" target="_blank"><img class="media" data-src="c" alt="a b"></a>'], '']);
|
|
88
|
+
assert.deepStrictEqual(inspect(parser, input('![©]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="©"></a>'], '']);
|
|
89
|
+
assert.deepStrictEqual(inspect(parser, input('![&copy;]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="&copy;"></a>'], '']);
|
|
90
|
+
assert.deepStrictEqual(inspect(parser, input('!{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
|
|
91
|
+
assert.deepStrictEqual(inspect(parser, input('!{ ][ }')), [['<a href="][" target="_blank"><img class="media" data-src="][" alt="]["></a>'], '']);
|
|
92
|
+
assert.deepStrictEqual(inspect(parser, input('!{ }{ }')), [['<a href="}{" target="_blank"><img class="media" data-src="}{" alt="}{"></a>'], '']);
|
|
94
93
|
});
|
|
95
94
|
|
|
96
95
|
it('nest', () => {
|
|
97
|
-
assert.deepStrictEqual(inspect(parser, input('![\\[]{/}'
|
|
98
|
-
assert.deepStrictEqual(inspect(parser, input('![\\"]{"?"#"}'
|
|
99
|
-
assert.deepStrictEqual(inspect(parser, input('![*a*]{/}'
|
|
100
|
-
assert.deepStrictEqual(inspect(parser, input('![<wbr>]{/}'
|
|
96
|
+
assert.deepStrictEqual(inspect(parser, input('![\\[]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="["></a>'], '']);
|
|
97
|
+
assert.deepStrictEqual(inspect(parser, input('![\\"]{"?"#"}')), [['<a href=""?"#"" target="_blank"><img class="media" data-src=""?"#"" alt="""></a>'], '']);
|
|
98
|
+
assert.deepStrictEqual(inspect(parser, input('![*a*]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="*a*"></a>'], '']);
|
|
99
|
+
assert.deepStrictEqual(inspect(parser, input('![<wbr>]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="<wbr>"></a>'], '']);
|
|
101
100
|
});
|
|
102
101
|
|
|
103
102
|
it('external', () => {
|
|
104
|
-
assert.deepStrictEqual(inspect(parser, input('![]{//host}'
|
|
105
|
-
assert.deepStrictEqual(inspect(parser, input('![]{//[::]}'
|
|
103
|
+
assert.deepStrictEqual(inspect(parser, input('![]{//host}')), [['<a href="//host" target="_blank"><img class="media" data-src="//host" alt="//host"></a>'], '']);
|
|
104
|
+
assert.deepStrictEqual(inspect(parser, input('![]{//[::]}')), [['<a href="//[::]" target="_blank"><img class="media" data-src="//[::]" alt="//[::]"></a>'], '']);
|
|
106
105
|
});
|
|
107
106
|
|
|
108
107
|
it('attribute', () => {
|
|
109
|
-
assert.deepStrictEqual(inspect(parser, input('![]{/ __proto__}'
|
|
110
|
-
assert.deepStrictEqual(inspect(parser, input('![]{/ constructor}'
|
|
111
|
-
assert.deepStrictEqual(inspect(parser, input('![]{/ aspect-ratio}'
|
|
112
|
-
assert.deepStrictEqual(inspect(parser, input('![]{/ nofollow}'
|
|
113
|
-
assert.deepStrictEqual(inspect(parser, input('![]{/ width="4" height="3"}'
|
|
114
|
-
assert.deepStrictEqual(inspect(parser, input('![]{/ 4x3}'
|
|
115
|
-
assert.deepStrictEqual(inspect(parser, input('![]{/ aspect-ratio="4/3"}'
|
|
116
|
-
assert.deepStrictEqual(inspect(parser, input('![]{/ aspect-ratio="4/3" nofollow}'
|
|
117
|
-
assert.deepStrictEqual(inspect(parser, input('![]{/ 4:3}'
|
|
108
|
+
assert.deepStrictEqual(inspect(parser, input('![]{/ __proto__}')), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
|
|
109
|
+
assert.deepStrictEqual(inspect(parser, input('![]{/ constructor}')), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
|
|
110
|
+
assert.deepStrictEqual(inspect(parser, input('![]{/ aspect-ratio}')), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
|
|
111
|
+
assert.deepStrictEqual(inspect(parser, input('![]{/ nofollow}')), [['<a href="/" rel="nofollow" target="_blank"><img class="media" data-src="/" alt="/"></a>'], '']);
|
|
112
|
+
assert.deepStrictEqual(inspect(parser, input('![]{/ width="4" height="3"}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" width="4" height="3"></a>'], '']);
|
|
113
|
+
assert.deepStrictEqual(inspect(parser, input('![]{/ 4x3}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" width="4" height="3"></a>'], '']);
|
|
114
|
+
assert.deepStrictEqual(inspect(parser, input('![]{/ aspect-ratio="4/3"}')), [['<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, input('![]{/ 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>'], '']);
|
|
116
|
+
assert.deepStrictEqual(inspect(parser, input('![]{/ 4:3}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" aspect-ratio="4/3" style="aspect-ratio: 4 / 3;"></a>'], '']);
|
|
118
117
|
});
|
|
119
118
|
|
|
120
119
|
});
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { MediaParser } from '../inline';
|
|
2
2
|
import { State, Recursion, Backtrack, Command } from '../context';
|
|
3
|
-
import { List, Node } from '../../combinator/
|
|
3
|
+
import { Result, List, Node } from '../../combinator/parser';
|
|
4
4
|
import { Flag } from '../node';
|
|
5
|
-
import { union, inits, tails, some,
|
|
5
|
+
import { union, inits, tails, some, recursion, precedence, constraint, backtrack, surround, open, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
|
|
6
6
|
import { uri, option as linkoption, resolve, decode, parse } from './link';
|
|
7
7
|
import { attributes } from './html';
|
|
8
8
|
import { unsafehtmlentity } from './htmlentity';
|
|
@@ -19,10 +19,10 @@ const optspec = {
|
|
|
19
19
|
} as const;
|
|
20
20
|
Object.setPrototypeOf(optspec, null);
|
|
21
21
|
|
|
22
|
-
export const media: MediaParser = lazy(() => constraint(State.media, open(
|
|
22
|
+
export const media: MediaParser = lazy(() => constraint(State.media, backtrack(open(
|
|
23
23
|
'!',
|
|
24
24
|
bind(fmap(tails([
|
|
25
|
-
dup(surround(
|
|
25
|
+
backtrack(dup(surround(
|
|
26
26
|
'[',
|
|
27
27
|
precedence(1, some(union([
|
|
28
28
|
unsafehtmlentity,
|
|
@@ -32,34 +32,28 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
|
|
|
32
32
|
']',
|
|
33
33
|
true,
|
|
34
34
|
[3 | Backtrack.escapable, 2 | Backtrack.ruby],
|
|
35
|
-
([, ns = new List()],
|
|
36
|
-
if (
|
|
37
|
-
const head =
|
|
38
|
-
return void setBacktrack(
|
|
35
|
+
([, ns = new List()], input, output) => {
|
|
36
|
+
if (input.linebreak !== 0 || ns.head?.flags! & Flag.blank || ns.head?.value?.[0].trimStart() === '') {
|
|
37
|
+
const head = input.position - input.range;
|
|
38
|
+
return void setBacktrack(input, 2 | Backtrack.escapable | Backtrack.ruby, head);
|
|
39
39
|
}
|
|
40
|
-
return ns;
|
|
41
|
-
})),
|
|
42
|
-
dup(surround(
|
|
40
|
+
return output.import(ns);
|
|
41
|
+
}))),
|
|
42
|
+
backtrack(dup(surround(
|
|
43
43
|
/{(?![{}])/y,
|
|
44
44
|
inits([uri, some(option)]),
|
|
45
45
|
/ ?}/y,
|
|
46
46
|
false, [],
|
|
47
47
|
undefined,
|
|
48
|
-
([as, bs]) =>
|
|
49
|
-
bs && as.import(bs).push(new Node(Command.Cancel))
|
|
48
|
+
([as, bs], _, output) =>
|
|
49
|
+
bs && output.import(as.import(bs).push(new Node(Command.Cancel)))))),
|
|
50
50
|
]),
|
|
51
51
|
nodes =>
|
|
52
52
|
nodes.length === 1
|
|
53
53
|
? new List<Node<List<Node<string>>>>([new Node(new List([new Node('')])), nodes.delete(nodes.head!)])
|
|
54
|
-
: new List<Node<List<Node<string>>>>([new Node(new List([new Node(nodes.head!.value.foldl((acc, { value }) => acc + value, ''), nodes.head!.value.head?.flags)])), nodes.delete(nodes.last!)])),
|
|
55
|
-
([{ value: [{ value: text
|
|
56
|
-
|
|
57
|
-
if (text) {
|
|
58
|
-
const tmp = text;
|
|
59
|
-
text = text.trim();
|
|
60
|
-
if (text === '' || text[0] !== tmp[0]) return;
|
|
61
|
-
}
|
|
62
|
-
spend(context, 100);
|
|
54
|
+
: new List<Node<List<Node<string>>>>([new Node(new List([new Node(nodes.head!.value.foldl((acc, { value }) => acc + value, '').trimEnd(), nodes.head!.value.head?.flags)])), nodes.delete(nodes.last!)])),
|
|
55
|
+
([{ value: [{ value: text }] }, { value: params }], input) => {
|
|
56
|
+
assert(text === text.trim());
|
|
63
57
|
if (params.last!.value === Command.Cancel) {
|
|
64
58
|
params.pop();
|
|
65
59
|
return new List([
|
|
@@ -68,7 +62,7 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
|
|
|
68
62
|
class: 'invalid',
|
|
69
63
|
...invalid('media', 'syntax', 'Missing the closing symbol "}"')
|
|
70
64
|
},
|
|
71
|
-
'!' +
|
|
65
|
+
'!' + input.source.slice(input.position - input.range, input.position)))
|
|
72
66
|
]);
|
|
73
67
|
}
|
|
74
68
|
const INSECURE_URI = params.shift()!.value;
|
|
@@ -79,14 +73,14 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
|
|
|
79
73
|
let uri: ReadonlyURL | undefined;
|
|
80
74
|
try {
|
|
81
75
|
uri = new ReadonlyURL(
|
|
82
|
-
resolve(INSECURE_URI,
|
|
83
|
-
|
|
76
|
+
resolve(INSECURE_URI, input.host ?? location, input.url ?? input.host ?? location),
|
|
77
|
+
input.host?.href || location.href);
|
|
84
78
|
}
|
|
85
79
|
catch {
|
|
86
80
|
}
|
|
87
81
|
let cache: HTMLElement | undefined;
|
|
88
82
|
const el = undefined
|
|
89
|
-
|| uri && (cache =
|
|
83
|
+
|| uri && (cache = input.caches?.media?.get(uri.href)?.cloneNode(true))
|
|
90
84
|
|| html('img', { class: 'media', 'data-src': uri?.source });
|
|
91
85
|
assert(!el.matches('.invalid'));
|
|
92
86
|
el.setAttribute('alt', text);
|
|
@@ -99,7 +93,7 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
|
|
|
99
93
|
if (el.hasAttribute('aspect-ratio')) {
|
|
100
94
|
el.style.aspectRatio = el.getAttribute('aspect-ratio')!;
|
|
101
95
|
}
|
|
102
|
-
if (
|
|
96
|
+
if (input.state & State.link) return new List([new Node(el)]);
|
|
103
97
|
if (cache && cache.tagName !== 'IMG') return new List([new Node(el)]);
|
|
104
98
|
return new List([new Node(define(
|
|
105
99
|
parse(
|
|
@@ -107,32 +101,32 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
|
|
|
107
101
|
linkparams.reduce(
|
|
108
102
|
(acc, p) => acc.push(new Node(p)) && acc,
|
|
109
103
|
new List([new Node(INSECURE_URI)])),
|
|
110
|
-
|
|
104
|
+
input),
|
|
111
105
|
{ class: null, target: '_blank' }, [el]))
|
|
112
106
|
]);
|
|
113
|
-
}))));
|
|
107
|
+
})))));
|
|
114
108
|
|
|
115
109
|
const bracket: MediaParser.TextParser.BracketParser = lazy(() => union([
|
|
116
|
-
surround(str('('), recursion(Recursion.
|
|
117
|
-
true, [], undefined, () =>
|
|
118
|
-
surround(str('['), recursion(Recursion.
|
|
119
|
-
true, [], undefined, () =>
|
|
120
|
-
surround(str('{'), recursion(Recursion.
|
|
121
|
-
true, [], undefined, () =>
|
|
122
|
-
surround(str('"'), precedence(2, recursion(Recursion.
|
|
123
|
-
true, [], undefined, () =>
|
|
110
|
+
surround(str('('), recursion(Recursion.bracket, some(union([unsafehtmlentity, bracket, txt]), ')')), str(')'),
|
|
111
|
+
true, [], undefined, () => Result.succ),
|
|
112
|
+
surround(str('['), recursion(Recursion.bracket, some(union([unsafehtmlentity, bracket, txt]), ']')), str(']'),
|
|
113
|
+
true, [], undefined, () => Result.succ),
|
|
114
|
+
surround(str('{'), recursion(Recursion.bracket, some(union([unsafehtmlentity, bracket, txt]), '}')), str('}'),
|
|
115
|
+
true, [], undefined, () => Result.succ),
|
|
116
|
+
surround(str('"'), precedence(2, recursion(Recursion.bracket, some(union([unsafehtmlentity, txt]), '"'))), str('"'),
|
|
117
|
+
true, [], undefined, () => Result.succ),
|
|
124
118
|
]));
|
|
125
119
|
|
|
126
120
|
const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([
|
|
127
|
-
surround(
|
|
121
|
+
backtrack(surround(
|
|
128
122
|
open(/ /y, str(/[1-9][0-9]*/y)),
|
|
129
123
|
str(/[x:]/y),
|
|
130
124
|
str(/[1-9][0-9]*(?=[ }])/y),
|
|
131
125
|
false, [],
|
|
132
|
-
([[{ value: a }], [{ value: b }], [{ value: c }]]) =>
|
|
126
|
+
([[{ value: a }], [{ value: b }], [{ value: c }]], _, output) =>
|
|
133
127
|
b === 'x'
|
|
134
|
-
? new List([new Node(`width="${a}"`), new Node(`height="${c}"`)])
|
|
135
|
-
: new List([new Node(`aspect-ratio="${a}/${c}"`)])),
|
|
128
|
+
? output.import(new List([new Node(`width="${a}"`), new Node(`height="${c}"`)]))
|
|
129
|
+
: output.import(new List([new Node(`aspect-ratio="${a}/${c}"`)])))),
|
|
136
130
|
linkoption,
|
|
137
131
|
]));
|
|
138
132
|
|