securemark 0.295.0 → 0.295.2

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.
Files changed (169) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/design.md +4 -3
  3. package/dist/index.js +529 -484
  4. package/markdown.d.ts +13 -28
  5. package/package.json +1 -1
  6. package/src/combinator/control/constraint/block.test.ts +6 -8
  7. package/src/combinator/control/constraint/contract.ts +7 -7
  8. package/src/combinator/control/constraint/line.test.ts +7 -9
  9. package/src/combinator/control/constraint/line.ts +0 -1
  10. package/src/combinator/control/manipulation/clear.ts +2 -2
  11. package/src/combinator/control/manipulation/convert.ts +3 -3
  12. package/src/combinator/control/manipulation/duplicate.ts +4 -4
  13. package/src/combinator/control/manipulation/fallback.ts +2 -2
  14. package/src/combinator/control/manipulation/fence.ts +3 -3
  15. package/src/combinator/control/manipulation/indent.test.ts +20 -22
  16. package/src/combinator/control/manipulation/indent.ts +2 -2
  17. package/src/combinator/control/manipulation/recovery.ts +3 -3
  18. package/src/combinator/control/manipulation/reverse.ts +2 -2
  19. package/src/combinator/control/manipulation/scope.ts +2 -4
  20. package/src/combinator/control/manipulation/surround.ts +66 -66
  21. package/src/combinator/control/monad/bind.ts +6 -6
  22. package/src/combinator/control/monad/fmap.ts +6 -6
  23. package/src/combinator/data/data.ts +2 -2
  24. package/src/combinator/data/{parser/context/delimiter.ts → delimiter.ts} +4 -4
  25. package/src/combinator/data/parser/context.test.ts +12 -11
  26. package/src/combinator/data/parser/context.ts +13 -14
  27. package/src/combinator/data/parser/inits.ts +5 -5
  28. package/src/combinator/data/parser/sequence.test.ts +12 -13
  29. package/src/combinator/data/parser/sequence.ts +5 -5
  30. package/src/combinator/data/parser/some.test.ts +15 -16
  31. package/src/combinator/data/parser/some.ts +5 -6
  32. package/src/combinator/data/parser/subsequence.test.ts +16 -17
  33. package/src/combinator/data/parser/subsequence.ts +3 -3
  34. package/src/combinator/data/parser/tails.ts +3 -3
  35. package/src/combinator/data/parser/union.test.ts +12 -13
  36. package/src/combinator/data/parser/union.ts +3 -3
  37. package/src/combinator/data/parser.ts +55 -32
  38. package/src/debug.test.ts +5 -3
  39. package/src/parser/api/bind.ts +8 -6
  40. package/src/parser/api/header.ts +4 -4
  41. package/src/parser/api/normalize.ts +2 -1
  42. package/src/parser/api/parse.test.ts +7 -6
  43. package/src/parser/api/parse.ts +9 -8
  44. package/src/parser/autolink.test.ts +18 -18
  45. package/src/parser/block/blockquote.test.ts +79 -79
  46. package/src/parser/block/blockquote.ts +5 -5
  47. package/src/parser/block/codeblock.test.ts +57 -57
  48. package/src/parser/block/codeblock.ts +3 -3
  49. package/src/parser/block/dlist.test.ts +57 -57
  50. package/src/parser/block/dlist.ts +6 -6
  51. package/src/parser/block/extension/aside.test.ts +9 -9
  52. package/src/parser/block/extension/aside.ts +5 -5
  53. package/src/parser/block/extension/example.test.ts +19 -19
  54. package/src/parser/block/extension/example.ts +6 -6
  55. package/src/parser/block/extension/fig.test.ts +36 -36
  56. package/src/parser/block/extension/figbase.test.ts +16 -16
  57. package/src/parser/block/extension/figbase.ts +2 -2
  58. package/src/parser/block/extension/figure.test.ts +63 -63
  59. package/src/parser/block/extension/figure.ts +3 -3
  60. package/src/parser/block/extension/message.test.ts +14 -14
  61. package/src/parser/block/extension/message.ts +5 -5
  62. package/src/parser/block/extension/placeholder.test.ts +13 -13
  63. package/src/parser/block/extension/placeholder.ts +2 -2
  64. package/src/parser/block/extension/table.test.ts +76 -76
  65. package/src/parser/block/extension/table.ts +14 -14
  66. package/src/parser/block/extension.test.ts +24 -24
  67. package/src/parser/block/heading.test.ts +59 -59
  68. package/src/parser/block/heading.ts +7 -7
  69. package/src/parser/block/ilist.test.ts +8 -12
  70. package/src/parser/block/ilist.ts +6 -6
  71. package/src/parser/block/mathblock.test.ts +32 -32
  72. package/src/parser/block/mathblock.ts +3 -3
  73. package/src/parser/block/mediablock.ts +3 -3
  74. package/src/parser/block/olist.test.ts +103 -103
  75. package/src/parser/block/olist.ts +5 -5
  76. package/src/parser/block/pagebreak.test.ts +16 -16
  77. package/src/parser/block/pagebreak.ts +2 -2
  78. package/src/parser/block/paragraph.test.ts +58 -58
  79. package/src/parser/block/paragraph.ts +2 -2
  80. package/src/parser/block/reply/cite.test.ts +40 -40
  81. package/src/parser/block/reply/cite.ts +6 -6
  82. package/src/parser/block/reply/quote.test.ts +51 -51
  83. package/src/parser/block/reply/quote.ts +3 -3
  84. package/src/parser/block/reply.test.ts +20 -20
  85. package/src/parser/block/reply.ts +3 -3
  86. package/src/parser/block/sidefence.test.ts +48 -48
  87. package/src/parser/block/sidefence.ts +4 -4
  88. package/src/parser/block/table.test.ts +50 -50
  89. package/src/parser/block/table.ts +12 -12
  90. package/src/parser/block/ulist.test.ts +53 -53
  91. package/src/parser/block/ulist.ts +6 -6
  92. package/src/parser/block.ts +6 -4
  93. package/src/parser/context.ts +39 -0
  94. package/src/parser/header.test.ts +23 -23
  95. package/src/parser/header.ts +5 -5
  96. package/src/parser/inline/annotation.test.ts +43 -43
  97. package/src/parser/inline/annotation.ts +15 -5
  98. package/src/parser/inline/autolink/account.test.ts +33 -33
  99. package/src/parser/inline/autolink/account.ts +9 -9
  100. package/src/parser/inline/autolink/anchor.test.ts +22 -22
  101. package/src/parser/inline/autolink/anchor.ts +4 -4
  102. package/src/parser/inline/autolink/channel.test.ts +15 -15
  103. package/src/parser/inline/autolink/email.test.ts +37 -37
  104. package/src/parser/inline/autolink/email.ts +2 -2
  105. package/src/parser/inline/autolink/hashnum.test.ts +33 -33
  106. package/src/parser/inline/autolink/hashnum.ts +6 -5
  107. package/src/parser/inline/autolink/hashtag.test.ts +60 -60
  108. package/src/parser/inline/autolink/hashtag.ts +4 -4
  109. package/src/parser/inline/autolink/url.test.ts +75 -75
  110. package/src/parser/inline/autolink/url.ts +4 -4
  111. package/src/parser/inline/bracket.test.ts +70 -70
  112. package/src/parser/inline/bracket.ts +35 -32
  113. package/src/parser/inline/code.test.ts +31 -31
  114. package/src/parser/inline/code.ts +4 -4
  115. package/src/parser/inline/deletion.test.ts +28 -28
  116. package/src/parser/inline/deletion.ts +4 -4
  117. package/src/parser/inline/emphasis.test.ts +40 -40
  118. package/src/parser/inline/emphasis.ts +3 -3
  119. package/src/parser/inline/emstrong.test.ts +101 -101
  120. package/src/parser/inline/emstrong.ts +23 -23
  121. package/src/parser/inline/extension/index.test.ts +92 -92
  122. package/src/parser/inline/extension/index.ts +5 -5
  123. package/src/parser/inline/extension/indexee.ts +5 -5
  124. package/src/parser/inline/extension/indexer.test.ts +24 -24
  125. package/src/parser/inline/extension/indexer.ts +2 -2
  126. package/src/parser/inline/extension/label.test.ts +33 -33
  127. package/src/parser/inline/extension/label.ts +2 -2
  128. package/src/parser/inline/extension/placeholder.test.ts +43 -43
  129. package/src/parser/inline/extension/placeholder.ts +4 -4
  130. package/src/parser/inline/html.test.ts +108 -108
  131. package/src/parser/inline/html.ts +10 -10
  132. package/src/parser/inline/htmlentity.test.ts +38 -38
  133. package/src/parser/inline/htmlentity.ts +5 -5
  134. package/src/parser/inline/insertion.test.ts +28 -28
  135. package/src/parser/inline/insertion.ts +4 -4
  136. package/src/parser/inline/italic.test.ts +55 -55
  137. package/src/parser/inline/italic.ts +4 -4
  138. package/src/parser/inline/link.test.ts +186 -187
  139. package/src/parser/inline/link.ts +16 -17
  140. package/src/parser/inline/mark.test.ts +31 -31
  141. package/src/parser/inline/mark.ts +5 -5
  142. package/src/parser/inline/math.test.ts +132 -132
  143. package/src/parser/inline/math.ts +2 -2
  144. package/src/parser/inline/media.test.ts +91 -91
  145. package/src/parser/inline/media.ts +15 -15
  146. package/src/parser/inline/reference.test.ts +109 -109
  147. package/src/parser/inline/reference.ts +16 -55
  148. package/src/parser/inline/remark.test.ts +50 -50
  149. package/src/parser/inline/remark.ts +5 -5
  150. package/src/parser/inline/ruby.test.ts +45 -45
  151. package/src/parser/inline/ruby.ts +17 -17
  152. package/src/parser/inline/shortmedia.test.ts +10 -10
  153. package/src/parser/inline/strong.test.ts +37 -37
  154. package/src/parser/inline/strong.ts +3 -3
  155. package/src/parser/inline/template.test.ts +23 -23
  156. package/src/parser/inline/template.ts +5 -5
  157. package/src/parser/inline.test.ts +224 -223
  158. package/src/parser/segment.ts +2 -2
  159. package/src/parser/source/escapable.test.ts +24 -24
  160. package/src/parser/source/escapable.ts +8 -8
  161. package/src/parser/source/line.test.ts +18 -18
  162. package/src/parser/source/str.ts +2 -2
  163. package/src/parser/source/text.test.ts +85 -85
  164. package/src/parser/source/text.ts +5 -5
  165. package/src/parser/source/unescapable.test.ts +24 -24
  166. package/src/parser/source/unescapable.ts +5 -5
  167. package/src/parser/util.ts +10 -11
  168. package/src/parser/visibility.ts +8 -9
  169. package/src/util/quote.ts +2 -1
@@ -1,118 +1,118 @@
1
1
  import { media } from './media';
2
2
  import { some } from '../../combinator';
3
3
  import { input } from '../../combinator/data/parser';
4
+ import { Context } from '../context';
4
5
  import { inspect } from '../../debug.test';
5
6
 
6
7
  describe('Unit: parser/inline/media', () => {
7
8
  describe('media', () => {
8
- const parser = (source: string) => some(media)(input(source, ctx));
9
- const { context: ctx } = input('', {});
9
+ const parser = some(media);
10
10
 
11
11
  it('xss', () => {
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="&quot;" target="_blank"><img class="media" data-src="&quot;" alt="&quot;"></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="&quot;"></a>'], '']);
12
+ assert.deepStrictEqual(inspect(parser, input('![]{javascript:alert}', new Context())), [['<img class="invalid" alt="javascript:alert">'], '']);
13
+ assert.deepStrictEqual(inspect(parser, input('![]{vbscript:alert}', new Context())), [['<img class="invalid" alt="vbscript:alert">'], '']);
14
+ assert.deepStrictEqual(inspect(parser, input('![]{data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K}', new Context())), [['<img class="invalid" alt="data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K">'], '']);
15
+ assert.deepStrictEqual(inspect(parser, input('![]{any:alert}', new Context())), [['<img class="invalid" alt="any:alert">'], '']);
16
+ assert.deepStrictEqual(inspect(parser, input('![]{"}', new Context())), [['<a href="&quot;" target="_blank"><img class="media" data-src="&quot;" alt="&quot;"></a>'], '']);
17
+ assert.deepStrictEqual(inspect(parser, input('![]{\\}', new Context())), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
18
+ assert.deepStrictEqual(inspect(parser, input('![\\"]{/}', new Context())), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="&quot;"></a>'], '']);
19
19
  });
20
20
 
21
21
  it('invalid', () => {
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), undefined);
31
- assert.deepStrictEqual(inspect(parser('![]{ }'), ctx), undefined);
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('![&Tab;]{b}'), ctx), undefined);
48
- assert.deepStrictEqual(inspect(parser('![&a;]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="&amp;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);
22
+ assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
23
+ assert.deepStrictEqual(inspect(parser, input('{}', new Context())), undefined);
24
+ assert.deepStrictEqual(inspect(parser, input('[]', new Context())), undefined);
25
+ assert.deepStrictEqual(inspect(parser, input('!{}', new Context())), undefined);
26
+ assert.deepStrictEqual(inspect(parser, input('![{b}', new Context())), undefined);
27
+ assert.deepStrictEqual(inspect(parser, input('![]', new Context())), undefined);
28
+ assert.deepStrictEqual(inspect(parser, input('![]{}', new Context())), undefined);
29
+ assert.deepStrictEqual(inspect(parser, input('![]{ }', new Context())), [['<span class="invalid">![]{ }</span>'], '']);
30
+ assert.deepStrictEqual(inspect(parser, input('![]{ }', new Context())), undefined);
31
+ assert.deepStrictEqual(inspect(parser, input('![]{ }', new Context())), undefined);
32
+ assert.deepStrictEqual(inspect(parser, input('![]]{/}', new Context())), undefined);
33
+ assert.deepStrictEqual(inspect(parser, input('![]{{}', new Context())), undefined);
34
+ assert.deepStrictEqual(inspect(parser, input('![]{}}', new Context())), undefined);
35
+ assert.deepStrictEqual(inspect(parser, input('![]{{}}', new Context())), undefined);
36
+ assert.deepStrictEqual(inspect(parser, input('![]{{b}}', new Context())), undefined);
37
+ assert.deepStrictEqual(inspect(parser, input('![]{b\nc}', new Context())), [['<span class="invalid">![]{b</span>'], '\nc}']);
38
+ assert.deepStrictEqual(inspect(parser, input('![]{b\\\nc}', new Context())), [['<span class="invalid">![]{b\\</span>'], '\nc}']);
39
+ assert.deepStrictEqual(inspect(parser, input('![]{ b}', new Context())), [['<span class="invalid">![]{ b}</span>'], '']);
40
+ assert.deepStrictEqual(inspect(parser, input('![]{ b\n}', new Context())), [['<span class="invalid">![]{ b</span>'], '\n}']);
41
+ assert.deepStrictEqual(inspect(parser, input('![ ]{}', new Context())), undefined);
42
+ assert.deepStrictEqual(inspect(parser, input('![ ]{b}', new Context())), undefined);
43
+ assert.deepStrictEqual(inspect(parser, input('![ ]{b}', new Context())), undefined);
44
+ assert.deepStrictEqual(inspect(parser, input('![\n]{b}', new Context())), undefined);
45
+ assert.deepStrictEqual(inspect(parser, input('![\\ ]{b}', new Context())), undefined);
46
+ assert.deepStrictEqual(inspect(parser, input('![\\\n]{b}', new Context())), undefined);
47
+ assert.deepStrictEqual(inspect(parser, input('![&Tab;]{b}', new Context())), undefined);
48
+ assert.deepStrictEqual(inspect(parser, input('![&a;]{b}', new Context())), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="&amp;a;"></a>'], '']);
49
+ assert.deepStrictEqual(inspect(parser, input('![[]{b}', new Context())), undefined);
50
+ assert.deepStrictEqual(inspect(parser, input('![]]{b}', new Context())), undefined);
51
+ assert.deepStrictEqual(inspect(parser, input('![a]{}', new Context())), undefined);
52
+ assert.deepStrictEqual(inspect(parser, input('![a\nb]{b}', new Context())), undefined);
53
+ assert.deepStrictEqual(inspect(parser, input('![a\\\nb]{b}', new Context())), undefined);
54
+ assert.deepStrictEqual(inspect(parser, input('![]{ttp://host}', new Context())), [['<img class="invalid" alt="ttp://host">'], '']);
55
+ assert.deepStrictEqual(inspect(parser, input('![]{tel:1234567890}', new Context())), [['<img class="invalid" alt="tel:1234567890">'], '']);
56
+ assert.deepStrictEqual(inspect(parser, input('![]{http://[::ffff:0:0%1]}', new Context())), [['<img class="invalid" alt="http://[::ffff:0:0%1]">'], '']);
57
+ assert.deepStrictEqual(inspect(parser, input('![]{http://[::ffff:0:0/96]}', new Context())), [['<img class="invalid" alt="http://[::ffff:0:0/96]">'], '']);
58
+ assert.deepStrictEqual(inspect(parser, input('![]{.}', new Context())), [['<img class="invalid" alt=".">'], '']);
59
+ assert.deepStrictEqual(inspect(parser, input('![]{..}', new Context())), [['<img class="invalid" alt="..">'], '']);
60
+ assert.deepStrictEqual(inspect(parser, input('![]{../}', new Context())), [['<img class="invalid" alt="../">'], '']);
61
+ assert.deepStrictEqual(inspect(parser, input('![]{/../b}', new Context())), [['<img class="invalid" alt="/../b">'], '']);
62
+ assert.deepStrictEqual(inspect(parser, input(' ![]{b}', new Context())), undefined);
63
+ assert.deepStrictEqual(inspect(parser, input('[]{/}', new Context())), undefined);
64
64
  });
65
65
 
66
66
  it('basic', () => {
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), [['<span class="invalid">![]{b</span>'], ' }']);
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), [['<span class="invalid">![]{ b</span>'], ' }']);
72
- assert.deepStrictEqual(inspect(parser('![]{ b }'), ctx), undefined);
73
- assert.deepStrictEqual(inspect(parser('![]{ b }'), ctx), undefined);
74
- assert.deepStrictEqual(inspect(parser('![]{"}'), ctx), [['<a href="&quot;" target="_blank"><img class="media" data-src="&quot;" alt="&quot;"></a>'], '']);
75
- assert.deepStrictEqual(inspect(parser('![]{"}"}'), ctx), [['<a href="&quot;" target="_blank"><img class="media" data-src="&quot;" alt="&quot;"></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('![]{\\b}'), ctx), [['<a href="\\b" target="_blank"><img class="media" data-src="\\b" alt="\\b"></a>'], '']);
79
- assert.deepStrictEqual(inspect(parser('![]{?/../}'), ctx), [[`<a href="?/../" target="_blank"><img class="media" data-src="?/../" alt="?/../"></a>`], '']);
80
- assert.deepStrictEqual(inspect(parser('![]{#/../}'), ctx), [[`<a href="#/../" target="_blank"><img class="media" data-src="#/../" alt="#/../"></a>`], '']);
81
- assert.deepStrictEqual(inspect(parser('![]{^/b}'), ctx), [[`<a href="/b" target="_blank"><img class="media" data-src="/b" alt="^/b"></a>`], '']);
82
- assert.deepStrictEqual(inspect(parser('![ a]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></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]{c}'), ctx), [['<a href="c" target="_blank"><img class="media" data-src="c" alt="a b"></a>'], '']);
87
- assert.deepStrictEqual(inspect(parser('![&copy;]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="©"></a>'], '']);
88
- assert.deepStrictEqual(inspect(parser('![&amp;copy;]{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="&amp;copy;"></a>'], '']);
89
- assert.deepStrictEqual(inspect(parser('!{b}'), ctx), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
90
- assert.deepStrictEqual(inspect(parser('!{ ][ }'), ctx), [['<a href="][" target="_blank"><img class="media" data-src="][" alt="]["></a>'], '']);
91
- assert.deepStrictEqual(inspect(parser('!{ }{ }'), ctx), [['<a href="}{" target="_blank"><img class="media" data-src="}{" alt="}{"></a>'], '']);
67
+ assert.deepStrictEqual(inspect(parser, input('![]{b}', new Context())), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
68
+ assert.deepStrictEqual(inspect(parser, input('![]{b }', new Context())), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
69
+ assert.deepStrictEqual(inspect(parser, input('![]{b }', new Context())), [['<span class="invalid">![]{b</span>'], ' }']);
70
+ assert.deepStrictEqual(inspect(parser, input('![]{ b }', new Context())), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
71
+ assert.deepStrictEqual(inspect(parser, input('![]{ b }', new Context())), [['<span class="invalid">![]{ b</span>'], ' }']);
72
+ assert.deepStrictEqual(inspect(parser, input('![]{ b }', new Context())), undefined);
73
+ assert.deepStrictEqual(inspect(parser, input('![]{ b }', new Context())), undefined);
74
+ assert.deepStrictEqual(inspect(parser, input('![]{"}', new Context())), [['<a href="&quot;" target="_blank"><img class="media" data-src="&quot;" alt="&quot;"></a>'], '']);
75
+ assert.deepStrictEqual(inspect(parser, input('![]{"}"}', new Context())), [['<a href="&quot;" target="_blank"><img class="media" data-src="&quot;" alt="&quot;"></a>'], '"}']);
76
+ assert.deepStrictEqual(inspect(parser, input('![]{\\}', new Context())), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
77
+ assert.deepStrictEqual(inspect(parser, input('![]{\\ }', new Context())), [['<a href="\\" target="_blank"><img class="media" data-src="\\" alt="\\"></a>'], '']);
78
+ assert.deepStrictEqual(inspect(parser, input('![]{\\b}', new Context())), [['<a href="\\b" target="_blank"><img class="media" data-src="\\b" alt="\\b"></a>'], '']);
79
+ assert.deepStrictEqual(inspect(parser, input('![]{?/../}', new Context())), [[`<a href="?/../" target="_blank"><img class="media" data-src="?/../" alt="?/../"></a>`], '']);
80
+ assert.deepStrictEqual(inspect(parser, input('![]{#/../}', new Context())), [[`<a href="#/../" target="_blank"><img class="media" data-src="#/../" alt="#/../"></a>`], '']);
81
+ assert.deepStrictEqual(inspect(parser, input('![]{^/b}', new Context())), [[`<a href="/b" target="_blank"><img class="media" data-src="/b" alt="^/b"></a>`], '']);
82
+ assert.deepStrictEqual(inspect(parser, input('![ a]{b}', new Context())), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
83
+ assert.deepStrictEqual(inspect(parser, input('![ a ]{b}', new Context())), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
84
+ assert.deepStrictEqual(inspect(parser, input('![a ]{b}', new Context())), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
85
+ assert.deepStrictEqual(inspect(parser, input('![a ]{b}', new Context())), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="a"></a>'], '']);
86
+ assert.deepStrictEqual(inspect(parser, input('![a b]{c}', new Context())), [['<a href="c" target="_blank"><img class="media" data-src="c" alt="a b"></a>'], '']);
87
+ assert.deepStrictEqual(inspect(parser, input('![&copy;]{b}', new Context())), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="©"></a>'], '']);
88
+ assert.deepStrictEqual(inspect(parser, input('![&amp;copy;]{b}', new Context())), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="&amp;copy;"></a>'], '']);
89
+ assert.deepStrictEqual(inspect(parser, input('!{b}', new Context())), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="b"></a>'], '']);
90
+ assert.deepStrictEqual(inspect(parser, input('!{ ][ }', new Context())), [['<a href="][" target="_blank"><img class="media" data-src="][" alt="]["></a>'], '']);
91
+ assert.deepStrictEqual(inspect(parser, input('!{ }{ }', new Context())), [['<a href="}{" target="_blank"><img class="media" data-src="}{" alt="}{"></a>'], '']);
92
92
  });
93
93
 
94
94
  it('nest', () => {
95
- assert.deepStrictEqual(inspect(parser('![\\[]{/}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="["></a>'], '']);
96
- assert.deepStrictEqual(inspect(parser('![\\"]{"?"#"}'), ctx), [['<a href="&quot;?&quot;#&quot;" target="_blank"><img class="media" data-src="&quot;?&quot;#&quot;" alt="&quot;"></a>'], '']);
97
- assert.deepStrictEqual(inspect(parser('![*a*]{/}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="*a*"></a>'], '']);
98
- assert.deepStrictEqual(inspect(parser('![<wbr>]{/}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="&lt;wbr&gt;"></a>'], '']);
95
+ assert.deepStrictEqual(inspect(parser, input('![\\[]{/}', new Context())), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="["></a>'], '']);
96
+ assert.deepStrictEqual(inspect(parser, input('![\\"]{"?"#"}', new Context())), [['<a href="&quot;?&quot;#&quot;" target="_blank"><img class="media" data-src="&quot;?&quot;#&quot;" alt="&quot;"></a>'], '']);
97
+ assert.deepStrictEqual(inspect(parser, input('![*a*]{/}', new Context())), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="*a*"></a>'], '']);
98
+ assert.deepStrictEqual(inspect(parser, input('![<wbr>]{/}', new Context())), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="&lt;wbr&gt;"></a>'], '']);
99
99
  });
100
100
 
101
101
  it('external', () => {
102
- assert.deepStrictEqual(inspect(parser('![]{//host}'), ctx), [['<a href="//host" target="_blank"><img class="media" data-src="//host" alt="//host"></a>'], '']);
103
- assert.deepStrictEqual(inspect(parser('![]{//[::]}'), ctx), [['<a href="//[::]" target="_blank"><img class="media" data-src="//[::]" alt="//[::]"></a>'], '']);
102
+ assert.deepStrictEqual(inspect(parser, input('![]{//host}', new Context())), [['<a href="//host" target="_blank"><img class="media" data-src="//host" alt="//host"></a>'], '']);
103
+ assert.deepStrictEqual(inspect(parser, input('![]{//[::]}', new Context())), [['<a href="//[::]" target="_blank"><img class="media" data-src="//[::]" alt="//[::]"></a>'], '']);
104
104
  });
105
105
 
106
106
  it('attribute', () => {
107
- assert.deepStrictEqual(inspect(parser('![]{/ __proto__}'), ctx), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
108
- assert.deepStrictEqual(inspect(parser('![]{/ constructor}'), ctx), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
109
- assert.deepStrictEqual(inspect(parser('![]{/ aspect-ratio}'), ctx), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
110
- assert.deepStrictEqual(inspect(parser('![]{/ nofollow}'), ctx), [['<a href="/" rel="nofollow" target="_blank"><img class="media" data-src="/" alt="/"></a>'], '']);
111
- assert.deepStrictEqual(inspect(parser('![]{/ width="4" height="3"}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" width="4" height="3"></a>'], '']);
112
- assert.deepStrictEqual(inspect(parser('![]{/ 4x3}'), ctx), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" width="4" height="3"></a>'], '']);
113
- 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>'], '']);
114
- 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>'], '']);
115
- 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>'], '']);
107
+ assert.deepStrictEqual(inspect(parser, input('![]{/ __proto__}', new Context())), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
108
+ assert.deepStrictEqual(inspect(parser, input('![]{/ constructor}', new Context())), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
109
+ assert.deepStrictEqual(inspect(parser, input('![]{/ aspect-ratio}', new Context())), [['<a href="/" target="_blank"><img class="invalid" data-src="/" alt="/"></a>'], '']);
110
+ assert.deepStrictEqual(inspect(parser, input('![]{/ nofollow}', new Context())), [['<a href="/" rel="nofollow" target="_blank"><img class="media" data-src="/" alt="/"></a>'], '']);
111
+ assert.deepStrictEqual(inspect(parser, input('![]{/ width="4" height="3"}', new Context())), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" width="4" height="3"></a>'], '']);
112
+ assert.deepStrictEqual(inspect(parser, input('![]{/ 4x3}', new Context())), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" width="4" height="3"></a>'], '']);
113
+ assert.deepStrictEqual(inspect(parser, input('![]{/ aspect-ratio="4/3"}', new Context())), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" aspect-ratio="4/3" style="aspect-ratio: 4 / 3;"></a>'], '']);
114
+ assert.deepStrictEqual(inspect(parser, input('![]{/ aspect-ratio="4/3" nofollow}', new Context())), [['<a href="/" rel="nofollow" target="_blank"><img class="media" data-src="/" alt="/" aspect-ratio="4/3" style="aspect-ratio: 4 / 3;"></a>'], '']);
115
+ assert.deepStrictEqual(inspect(parser, input('![]{/ 4:3}', new Context())), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="/" aspect-ratio="4/3" style="aspect-ratio: 4 / 3;"></a>'], '']);
116
116
  });
117
117
 
118
118
  });
@@ -1,6 +1,6 @@
1
1
  import { MediaParser } from '../inline';
2
2
  import { State, Recursion, Backtrack, Command } from '../context';
3
- import { List, Data } from '../../combinator/data/parser';
3
+ import { List, Node } from '../../combinator/data/parser';
4
4
  import { union, inits, tails, some, consume, recursion, precedence, constraint, surround, open, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
5
5
  import { uri, option as linkoption, resolve, decode, parse } from './link';
6
6
  import { attributes } from './html';
@@ -33,7 +33,7 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
33
33
  [3 | Backtrack.escapable, 2 | Backtrack.ruby],
34
34
  ([, ns = new List()], context) => {
35
35
  if (context.linebreak !== 0) {
36
- const head = context.position - context.range!;
36
+ const head = context.position - context.range;
37
37
  return void setBacktrack(context, 2 | Backtrack.link | Backtrack.ruby, head);
38
38
  }
39
39
  return ns;
@@ -45,12 +45,12 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
45
45
  false, [],
46
46
  undefined,
47
47
  ([as, bs]) =>
48
- bs && as.import(bs).push(new Data(Command.Cancel)) && as)),
48
+ bs && as.import(bs).push(new Node(Command.Cancel)) && as)),
49
49
  ]),
50
50
  nodes =>
51
51
  nodes.length === 1
52
- ? new List<Data<List<Data<string>>>>([new Data(new List([new Data('')])), nodes.delete(nodes.head!)])
53
- : new List<Data<List<Data<string>>>>([new Data(new List([new Data(nodes.head!.value.foldl((acc, { value }) => acc + value, ''))])), nodes.delete(nodes.last!)])),
52
+ ? new List<Node<List<Node<string>>>>([new Node(new List([new Node('')])), nodes.delete(nodes.head!)])
53
+ : new List<Node<List<Node<string>>>>([new Node(new List([new Node(nodes.head!.value.foldl((acc, { value }) => acc + value, ''))])), nodes.delete(nodes.last!)])),
54
54
  ([{ value: [{ value: text }] }, { value: params }], context) => {
55
55
  if (text && text.trimStart() === '') return;
56
56
  text = text.trim();
@@ -58,12 +58,12 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
58
58
  if (params.last!.value === Command.Cancel) {
59
59
  params.pop();
60
60
  return new List([
61
- new Data(html('span',
61
+ new Node(html('span',
62
62
  {
63
63
  class: 'invalid',
64
64
  ...invalid('media', 'syntax', 'Missing the closing symbol "}"')
65
65
  },
66
- '!' + context.source.slice(context.position - context.range!, context.position)))
66
+ '!' + context.source.slice(context.position - context.range, context.position)))
67
67
  ]);
68
68
  }
69
69
  const INSECURE_URI = params.shift()!.value;
@@ -85,7 +85,7 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
85
85
  || html('img', { class: 'media', 'data-src': uri?.source });
86
86
  assert(!el.matches('.invalid'));
87
87
  el.setAttribute('alt', text);
88
- if (!sanitize(el, uri)) return new List([new Data(el)]);
88
+ if (!sanitize(el, uri)) return new List([new Node(el)]);
89
89
  assert(!el.matches('.invalid'));
90
90
  const [attrs, linkparams] = attributes('media', optspec, unwrap(params));
91
91
  define(el, attrs);
@@ -94,14 +94,14 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
94
94
  if (el.hasAttribute('aspect-ratio')) {
95
95
  el.style.aspectRatio = el.getAttribute('aspect-ratio')!;
96
96
  }
97
- if (context.state! & State.link) return new List([new Data(el)]);
98
- if (cache && cache.tagName !== 'IMG') return new List([new Data(el)]);
99
- return new List([new Data(define(
97
+ if (context.state & State.link) return new List([new Node(el)]);
98
+ if (cache && cache.tagName !== 'IMG') return new List([new Node(el)]);
99
+ return new List([new Node(define(
100
100
  parse(
101
101
  new List(),
102
102
  linkparams.reduce(
103
- (acc, p) => acc.push(new Data(p)) && acc,
104
- new List([new Data(INSECURE_URI)])),
103
+ (acc, p) => acc.push(new Node(p)) && acc,
104
+ new List([new Node(INSECURE_URI)])),
105
105
  context),
106
106
  { class: null, target: '_blank' }, [el]))
107
107
  ]);
@@ -126,8 +126,8 @@ const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([
126
126
  false, [],
127
127
  ([[{ value: a }], [{ value: b }], [{ value: c }]]) =>
128
128
  b === 'x'
129
- ? new List([new Data(`width="${a}"`), new Data(`height="${c}"`)])
130
- : new List([new Data(`aspect-ratio="${a}/${c}"`)])),
129
+ ? new List([new Node(`width="${a}"`), new Node(`height="${c}"`)])
130
+ : new List([new Node(`aspect-ratio="${a}/${c}"`)])),
131
131
  linkoption,
132
132
  ]));
133
133