securemark 0.291.1 → 0.293.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.
Files changed (177) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/design.md +13 -2
  3. package/dist/index.js +1353 -908
  4. package/markdown.d.ts +32 -49
  5. package/package.json +1 -1
  6. package/src/combinator/control/constraint/block.test.ts +8 -5
  7. package/src/combinator/control/constraint/block.ts +9 -9
  8. package/src/combinator/control/constraint/contract.ts +21 -38
  9. package/src/combinator/control/constraint/line.test.ts +9 -6
  10. package/src/combinator/control/constraint/line.ts +21 -22
  11. package/src/combinator/control/manipulation/clear.ts +3 -4
  12. package/src/combinator/control/manipulation/convert.ts +29 -13
  13. package/src/combinator/control/manipulation/fence.ts +20 -15
  14. package/src/combinator/control/manipulation/indent.test.ts +17 -14
  15. package/src/combinator/control/manipulation/indent.ts +14 -13
  16. package/src/combinator/control/manipulation/match.ts +13 -11
  17. package/src/combinator/control/manipulation/recovery.ts +7 -3
  18. package/src/combinator/control/manipulation/scope.ts +36 -44
  19. package/src/combinator/control/manipulation/surround.ts +69 -71
  20. package/src/combinator/control/manipulation/trim.test.ts +12 -9
  21. package/src/combinator/control/monad/bind.ts +16 -16
  22. package/src/combinator/control/monad/fmap.ts +6 -6
  23. package/src/combinator/data/parser/context/delimiter.ts +10 -8
  24. package/src/combinator/data/parser/context.test.ts +19 -14
  25. package/src/combinator/data/parser/context.ts +51 -16
  26. package/src/combinator/data/parser/inits.ts +13 -14
  27. package/src/combinator/data/parser/sequence.test.ts +16 -15
  28. package/src/combinator/data/parser/sequence.ts +13 -14
  29. package/src/combinator/data/parser/some.test.ts +20 -19
  30. package/src/combinator/data/parser/some.ts +14 -17
  31. package/src/combinator/data/parser/subsequence.test.ts +22 -21
  32. package/src/combinator/data/parser/subsequence.ts +3 -3
  33. package/src/combinator/data/parser/tails.ts +3 -3
  34. package/src/combinator/data/parser/union.test.ts +16 -15
  35. package/src/combinator/data/parser/union.ts +2 -2
  36. package/src/combinator/data/parser.ts +65 -28
  37. package/src/debug.test.ts +3 -3
  38. package/src/parser/api/bind.ts +3 -3
  39. package/src/parser/api/header.ts +7 -6
  40. package/src/parser/api/normalize.ts +2 -2
  41. package/src/parser/api/parse.test.ts +26 -19
  42. package/src/parser/api/parse.ts +4 -5
  43. package/src/parser/autolink.test.ts +19 -17
  44. package/src/parser/autolink.ts +2 -4
  45. package/src/parser/block/blockquote.test.ts +86 -84
  46. package/src/parser/block/blockquote.ts +10 -8
  47. package/src/parser/block/codeblock.test.ts +58 -56
  48. package/src/parser/block/codeblock.ts +4 -4
  49. package/src/parser/block/dlist.test.ts +58 -56
  50. package/src/parser/block/dlist.ts +6 -6
  51. package/src/parser/block/extension/aside.test.ts +10 -8
  52. package/src/parser/block/extension/aside.ts +2 -2
  53. package/src/parser/block/extension/example.test.ts +20 -18
  54. package/src/parser/block/extension/example.ts +4 -4
  55. package/src/parser/block/extension/fig.test.ts +38 -36
  56. package/src/parser/block/extension/fig.ts +4 -4
  57. package/src/parser/block/extension/figbase.test.ts +17 -15
  58. package/src/parser/block/extension/figbase.ts +1 -1
  59. package/src/parser/block/extension/figure.test.ts +64 -62
  60. package/src/parser/block/extension/figure.ts +7 -6
  61. package/src/parser/block/extension/message.test.ts +15 -13
  62. package/src/parser/block/extension/message.ts +4 -4
  63. package/src/parser/block/extension/placeholder.test.ts +3 -1
  64. package/src/parser/block/extension/placeholder.ts +1 -1
  65. package/src/parser/block/extension/table.test.ts +72 -70
  66. package/src/parser/block/extension/table.ts +19 -19
  67. package/src/parser/block/extension.test.ts +3 -1
  68. package/src/parser/block/extension.ts +2 -2
  69. package/src/parser/block/heading.test.ts +65 -64
  70. package/src/parser/block/heading.ts +5 -5
  71. package/src/parser/block/ilist.test.ts +6 -4
  72. package/src/parser/block/ilist.ts +7 -7
  73. package/src/parser/block/mathblock.test.ts +33 -31
  74. package/src/parser/block/mathblock.ts +2 -2
  75. package/src/parser/block/mediablock.ts +3 -3
  76. package/src/parser/block/olist.test.ts +101 -97
  77. package/src/parser/block/olist.ts +14 -14
  78. package/src/parser/block/pagebreak.test.ts +17 -15
  79. package/src/parser/block/pagebreak.ts +2 -2
  80. package/src/parser/block/paragraph.test.ts +60 -57
  81. package/src/parser/block/paragraph.ts +2 -2
  82. package/src/parser/block/reply/cite.test.ts +41 -39
  83. package/src/parser/block/reply/cite.ts +4 -4
  84. package/src/parser/block/reply/quote.test.ts +52 -50
  85. package/src/parser/block/reply/quote.ts +5 -4
  86. package/src/parser/block/reply.test.ts +21 -19
  87. package/src/parser/block/reply.ts +3 -3
  88. package/src/parser/block/sidefence.test.ts +51 -49
  89. package/src/parser/block/sidefence.ts +3 -3
  90. package/src/parser/block/table.test.ts +51 -50
  91. package/src/parser/block/table.ts +14 -14
  92. package/src/parser/block/ulist.test.ts +53 -50
  93. package/src/parser/block/ulist.ts +8 -8
  94. package/src/parser/block.ts +53 -19
  95. package/src/parser/context.ts +1 -0
  96. package/src/parser/header.test.ts +22 -21
  97. package/src/parser/header.ts +28 -16
  98. package/src/parser/inline/annotation.test.ts +44 -42
  99. package/src/parser/inline/annotation.ts +2 -2
  100. package/src/parser/inline/autolink/account.test.ts +33 -30
  101. package/src/parser/inline/autolink/account.ts +12 -9
  102. package/src/parser/inline/autolink/anchor.test.ts +23 -21
  103. package/src/parser/inline/autolink/anchor.ts +21 -17
  104. package/src/parser/inline/autolink/channel.test.ts +16 -14
  105. package/src/parser/inline/autolink/channel.ts +40 -15
  106. package/src/parser/inline/autolink/email.test.ts +38 -36
  107. package/src/parser/inline/autolink/email.ts +7 -9
  108. package/src/parser/inline/autolink/hashnum.test.ts +34 -37
  109. package/src/parser/inline/autolink/hashnum.ts +9 -5
  110. package/src/parser/inline/autolink/hashtag.test.ts +57 -56
  111. package/src/parser/inline/autolink/hashtag.ts +10 -7
  112. package/src/parser/inline/autolink/url.test.ts +75 -75
  113. package/src/parser/inline/autolink/url.ts +24 -28
  114. package/src/parser/inline/autolink.ts +21 -24
  115. package/src/parser/inline/bracket.test.ts +69 -67
  116. package/src/parser/inline/bracket.ts +35 -35
  117. package/src/parser/inline/code.test.ts +32 -29
  118. package/src/parser/inline/code.ts +20 -13
  119. package/src/parser/inline/deletion.test.ts +29 -27
  120. package/src/parser/inline/deletion.ts +3 -3
  121. package/src/parser/inline/emphasis.test.ts +40 -36
  122. package/src/parser/inline/emphasis.ts +4 -9
  123. package/src/parser/inline/emstrong.test.ts +102 -96
  124. package/src/parser/inline/emstrong.ts +93 -45
  125. package/src/parser/inline/extension/index.test.ts +93 -89
  126. package/src/parser/inline/extension/index.ts +16 -31
  127. package/src/parser/inline/extension/indexee.ts +1 -1
  128. package/src/parser/inline/extension/indexer.test.ts +26 -24
  129. package/src/parser/inline/extension/indexer.ts +3 -3
  130. package/src/parser/inline/extension/label.test.ts +34 -32
  131. package/src/parser/inline/extension/label.ts +1 -1
  132. package/src/parser/inline/extension/placeholder.test.ts +44 -42
  133. package/src/parser/inline/extension/placeholder.ts +12 -9
  134. package/src/parser/inline/html.test.ts +108 -106
  135. package/src/parser/inline/html.ts +38 -37
  136. package/src/parser/inline/htmlentity.test.ts +39 -37
  137. package/src/parser/inline/htmlentity.ts +9 -3
  138. package/src/parser/inline/insertion.test.ts +29 -27
  139. package/src/parser/inline/insertion.ts +3 -3
  140. package/src/parser/inline/italic.test.ts +55 -53
  141. package/src/parser/inline/italic.ts +3 -3
  142. package/src/parser/inline/link.test.ts +187 -185
  143. package/src/parser/inline/link.ts +45 -27
  144. package/src/parser/inline/mark.test.ts +31 -29
  145. package/src/parser/inline/mark.ts +4 -4
  146. package/src/parser/inline/math.test.ts +133 -131
  147. package/src/parser/inline/math.ts +9 -13
  148. package/src/parser/inline/media.test.ts +93 -91
  149. package/src/parser/inline/media.ts +50 -26
  150. package/src/parser/inline/reference.test.ts +110 -108
  151. package/src/parser/inline/reference.ts +50 -41
  152. package/src/parser/inline/remark.test.ts +53 -51
  153. package/src/parser/inline/remark.ts +5 -5
  154. package/src/parser/inline/ruby.test.ts +46 -44
  155. package/src/parser/inline/ruby.ts +26 -27
  156. package/src/parser/inline/shortmedia.test.ts +11 -9
  157. package/src/parser/inline/shortmedia.ts +6 -9
  158. package/src/parser/inline/strong.test.ts +37 -33
  159. package/src/parser/inline/strong.ts +7 -9
  160. package/src/parser/inline/template.test.ts +24 -22
  161. package/src/parser/inline/template.ts +20 -11
  162. package/src/parser/inline.test.ts +223 -220
  163. package/src/parser/inline.ts +13 -8
  164. package/src/parser/segment.ts +13 -8
  165. package/src/parser/source/escapable.test.ts +24 -22
  166. package/src/parser/source/escapable.ts +50 -41
  167. package/src/parser/source/line.test.ts +19 -17
  168. package/src/parser/source/line.ts +28 -4
  169. package/src/parser/source/str.ts +18 -23
  170. package/src/parser/source/text.test.ts +85 -83
  171. package/src/parser/source/text.ts +78 -54
  172. package/src/parser/source/unescapable.test.ts +24 -22
  173. package/src/parser/source/unescapable.ts +42 -33
  174. package/src/parser/source.ts +1 -1
  175. package/src/parser/util.ts +39 -36
  176. package/src/parser/visibility.ts +33 -24
  177. package/src/util/quote.ts +4 -2
@@ -1,104 +1,106 @@
1
1
  import { blockquote } from './blockquote';
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/block/blockquote', () => {
6
7
  describe('blockquote', () => {
7
- const parser = (source: string) => some(blockquote)({ source, context: {} });
8
+ const parser = (source: string) => some(blockquote)(input(source, ctx));
9
+ const { context: ctx } = input('', {});
8
10
 
9
11
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('')), undefined);
11
- assert.deepStrictEqual(inspect(parser('\n')), undefined);
12
- assert.deepStrictEqual(inspect(parser('>')), undefined);
13
- assert.deepStrictEqual(inspect(parser('>a')), undefined);
14
- assert.deepStrictEqual(inspect(parser('>\n')), undefined);
15
- assert.deepStrictEqual(inspect(parser(' > ')), undefined);
16
- assert.deepStrictEqual(inspect(parser('>>')), undefined);
12
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
+ assert.deepStrictEqual(inspect(parser('\n'), ctx), undefined);
14
+ assert.deepStrictEqual(inspect(parser('>'), ctx), undefined);
15
+ assert.deepStrictEqual(inspect(parser('>a'), ctx), undefined);
16
+ assert.deepStrictEqual(inspect(parser('>\n'), ctx), undefined);
17
+ assert.deepStrictEqual(inspect(parser(' > '), ctx), undefined);
18
+ assert.deepStrictEqual(inspect(parser('>>'), ctx), undefined);
17
19
  });
18
20
 
19
21
  it('basic', () => {
20
- assert.deepStrictEqual(inspect(parser('> ')), [['<blockquote></blockquote>'], '']);
21
- assert.deepStrictEqual(inspect(parser('> \\')), [['<blockquote><pre>\\</pre></blockquote>'], '']);
22
- assert.deepStrictEqual(inspect(parser('> \\\n')), [['<blockquote><pre>\\</pre></blockquote>'], '']);
23
- assert.deepStrictEqual(inspect(parser('> a')), [['<blockquote><pre>a</pre></blockquote>'], '']);
24
- assert.deepStrictEqual(inspect(parser('> a\n')), [['<blockquote><pre>a</pre></blockquote>'], '']);
25
- assert.deepStrictEqual(inspect(parser('> a\nb')), [['<blockquote><pre>a<br>b</pre></blockquote>'], '']);
26
- assert.deepStrictEqual(inspect(parser('> a\n b ')), [['<blockquote><pre>a<br> b </pre></blockquote>'], '']);
27
- assert.deepStrictEqual(inspect(parser('> a\n>')), [['<blockquote><pre>a<br></pre></blockquote>'], '']);
28
- assert.deepStrictEqual(inspect(parser('> a\n>>1')), [['<blockquote><pre>a<br><a class="anchor" href="?at=1">&gt;&gt;1</a></pre></blockquote>'], '']);
29
- assert.deepStrictEqual(inspect(parser('> a\n> b ')), [['<blockquote><pre>a<br>b </pre></blockquote>'], '']);
30
- assert.deepStrictEqual(inspect(parser('> a\n>\n')), [['<blockquote><pre>a<br></pre></blockquote>'], '']);
31
- assert.deepStrictEqual(inspect(parser('> a\n>\nb')), [['<blockquote><pre>a<br><br>b</pre></blockquote>'], '']);
32
- assert.deepStrictEqual(inspect(parser('> a\n>\n b ')), [['<blockquote><pre>a<br><br> b </pre></blockquote>'], '']);
33
- assert.deepStrictEqual(inspect(parser('> a\n>\n>')), [['<blockquote><pre>a<br><br></pre></blockquote>'], '']);
34
- assert.deepStrictEqual(inspect(parser('> a\n>\n>>1')), [['<blockquote><pre>a<br><br><a class="anchor" href="?at=1">&gt;&gt;1</a></pre></blockquote>'], '']);
35
- assert.deepStrictEqual(inspect(parser('> a\n>\n> b ')), [['<blockquote><pre>a<br><br>b </pre></blockquote>'], '']);
36
- assert.deepStrictEqual(inspect(parser('> a\\\nb')), [['<blockquote><pre>a\\<br>b</pre></blockquote>'], '']);
37
- assert.deepStrictEqual(inspect(parser('> a ')), [['<blockquote><pre> a </pre></blockquote>'], '']);
38
- assert.deepStrictEqual(inspect(parser('> \na')), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
39
- assert.deepStrictEqual(inspect(parser('>\na')), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
40
- assert.deepStrictEqual(inspect(parser('>\n a')), [['<blockquote><pre><br> a</pre></blockquote>'], '']);
41
- assert.deepStrictEqual(inspect(parser('>\n>')), [['<blockquote><pre><br></pre></blockquote>'], '']);
42
- assert.deepStrictEqual(inspect(parser('>\n> a')), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
43
- assert.deepStrictEqual(inspect(parser('> http://host')), [['<blockquote><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
44
- assert.deepStrictEqual(inspect(parser('> http://host)')), [['<blockquote><pre><a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
45
- assert.deepStrictEqual(inspect(parser('> !http://host')), [['<blockquote><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
46
- assert.deepStrictEqual(inspect(parser('> !http://host)')), [['<blockquote><pre>!<a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
47
- assert.deepStrictEqual(inspect(parser('> #a')), [['<blockquote><pre><a class="hashtag" href="/hashtags/a">#a</a></pre></blockquote>'], '']);
48
- assert.deepStrictEqual(inspect(parser('> @a#b')), [['<blockquote><pre><a class="channel" href="/@a?ch=b">@a#b</a></pre></blockquote>'], '']);
49
- assert.deepStrictEqual(inspect(parser('> >>1\n> > b')), [['<blockquote><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>&gt; b</pre></blockquote>'], '']);
50
- assert.deepStrictEqual(inspect(parser('> >>1\n> > b\n> c')), [['<blockquote><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>&gt; b<br>c</pre></blockquote>'], '']);
22
+ assert.deepStrictEqual(inspect(parser('> '), ctx), [['<blockquote></blockquote>'], '']);
23
+ assert.deepStrictEqual(inspect(parser('> \\'), ctx), [['<blockquote><pre>\\</pre></blockquote>'], '']);
24
+ assert.deepStrictEqual(inspect(parser('> \\\n'), ctx), [['<blockquote><pre>\\</pre></blockquote>'], '']);
25
+ assert.deepStrictEqual(inspect(parser('> a'), ctx), [['<blockquote><pre>a</pre></blockquote>'], '']);
26
+ assert.deepStrictEqual(inspect(parser('> a\n'), ctx), [['<blockquote><pre>a</pre></blockquote>'], '']);
27
+ assert.deepStrictEqual(inspect(parser('> a\nb'), ctx), [['<blockquote><pre>a<br>b</pre></blockquote>'], '']);
28
+ assert.deepStrictEqual(inspect(parser('> a\n b '), ctx), [['<blockquote><pre>a<br> b </pre></blockquote>'], '']);
29
+ assert.deepStrictEqual(inspect(parser('> a\n>'), ctx), [['<blockquote><pre>a<br></pre></blockquote>'], '']);
30
+ assert.deepStrictEqual(inspect(parser('> a\n>>1'), ctx), [['<blockquote><pre>a<br><a class="anchor" href="?at=1">&gt;&gt;1</a></pre></blockquote>'], '']);
31
+ assert.deepStrictEqual(inspect(parser('> a\n> b '), ctx), [['<blockquote><pre>a<br>b </pre></blockquote>'], '']);
32
+ assert.deepStrictEqual(inspect(parser('> a\n>\n'), ctx), [['<blockquote><pre>a<br></pre></blockquote>'], '']);
33
+ assert.deepStrictEqual(inspect(parser('> a\n>\nb'), ctx), [['<blockquote><pre>a<br><br>b</pre></blockquote>'], '']);
34
+ assert.deepStrictEqual(inspect(parser('> a\n>\n b '), ctx), [['<blockquote><pre>a<br><br> b </pre></blockquote>'], '']);
35
+ assert.deepStrictEqual(inspect(parser('> a\n>\n>'), ctx), [['<blockquote><pre>a<br><br></pre></blockquote>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('> a\n>\n>>1'), ctx), [['<blockquote><pre>a<br><br><a class="anchor" href="?at=1">&gt;&gt;1</a></pre></blockquote>'], '']);
37
+ assert.deepStrictEqual(inspect(parser('> a\n>\n> b '), ctx), [['<blockquote><pre>a<br><br>b </pre></blockquote>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('> a\\\nb'), ctx), [['<blockquote><pre>a\\<br>b</pre></blockquote>'], '']);
39
+ assert.deepStrictEqual(inspect(parser('> a '), ctx), [['<blockquote><pre> a </pre></blockquote>'], '']);
40
+ assert.deepStrictEqual(inspect(parser('> \na'), ctx), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
41
+ assert.deepStrictEqual(inspect(parser('>\na'), ctx), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
42
+ assert.deepStrictEqual(inspect(parser('>\n a'), ctx), [['<blockquote><pre><br> a</pre></blockquote>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('>\n>'), ctx), [['<blockquote><pre><br></pre></blockquote>'], '']);
44
+ assert.deepStrictEqual(inspect(parser('>\n> a'), ctx), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
45
+ assert.deepStrictEqual(inspect(parser('> http://host'), ctx), [['<blockquote><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
46
+ assert.deepStrictEqual(inspect(parser('> http://host)'), ctx), [['<blockquote><pre><a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
47
+ assert.deepStrictEqual(inspect(parser('> !http://host'), ctx), [['<blockquote><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
48
+ assert.deepStrictEqual(inspect(parser('> !http://host)'), ctx), [['<blockquote><pre>!<a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
49
+ assert.deepStrictEqual(inspect(parser('> #a'), ctx), [['<blockquote><pre><a class="hashtag" href="/hashtags/a">#a</a></pre></blockquote>'], '']);
50
+ assert.deepStrictEqual(inspect(parser('> @a#b'), ctx), [['<blockquote><pre><a class="channel" href="/@a?ch=b">@a#b</a></pre></blockquote>'], '']);
51
+ assert.deepStrictEqual(inspect(parser('> >>1\n> > b'), ctx), [['<blockquote><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>&gt; b</pre></blockquote>'], '']);
52
+ assert.deepStrictEqual(inspect(parser('> >>1\n> > b\n> c'), ctx), [['<blockquote><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>&gt; b<br>c</pre></blockquote>'], '']);
51
53
  });
52
54
 
53
55
  it('nest', () => {
54
- assert.deepStrictEqual(inspect(parser('> a\n>>')), [['<blockquote><pre>a</pre><blockquote></blockquote></blockquote>'], '']);
55
- assert.deepStrictEqual(inspect(parser('> a\n>> b\n> c')), [['<blockquote><pre>a</pre><blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
56
- assert.deepStrictEqual(inspect(parser('> a\n>> b\n>> c')), [['<blockquote><pre>a</pre><blockquote><pre>b<br>c</pre></blockquote></blockquote>'], '']);
57
- assert.deepStrictEqual(inspect(parser('> a\n>> b\n>>> c')), [['<blockquote><pre>a</pre><blockquote><pre>b</pre><blockquote><pre>c</pre></blockquote></blockquote></blockquote>'], '']);
58
- assert.deepStrictEqual(inspect(parser('>> a')), [['<blockquote><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
59
- assert.deepStrictEqual(inspect(parser('>> a\n>')), [['<blockquote><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
60
- assert.deepStrictEqual(inspect(parser('>> a\n> b')), [['<blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote>'], '']);
61
- assert.deepStrictEqual(inspect(parser('>> a\n>>> b\n> c')), [['<blockquote><blockquote><pre>a</pre><blockquote><pre>b</pre></blockquote></blockquote><pre>c</pre></blockquote>'], '']);
62
- assert.deepStrictEqual(inspect(parser('>> a\n> b\n>>> c')), [['<blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre><blockquote><blockquote><pre>c</pre></blockquote></blockquote></blockquote>'], '']);
63
- assert.deepStrictEqual(inspect(parser('>>> a\n>> b\n> c')), [['<blockquote><blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
56
+ assert.deepStrictEqual(inspect(parser('> a\n>>'), ctx), [['<blockquote><pre>a</pre><blockquote></blockquote></blockquote>'], '']);
57
+ assert.deepStrictEqual(inspect(parser('> a\n>> b\n> c'), ctx), [['<blockquote><pre>a</pre><blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
58
+ assert.deepStrictEqual(inspect(parser('> a\n>> b\n>> c'), ctx), [['<blockquote><pre>a</pre><blockquote><pre>b<br>c</pre></blockquote></blockquote>'], '']);
59
+ assert.deepStrictEqual(inspect(parser('> a\n>> b\n>>> c'), ctx), [['<blockquote><pre>a</pre><blockquote><pre>b</pre><blockquote><pre>c</pre></blockquote></blockquote></blockquote>'], '']);
60
+ assert.deepStrictEqual(inspect(parser('>> a'), ctx), [['<blockquote><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
61
+ assert.deepStrictEqual(inspect(parser('>> a\n>'), ctx), [['<blockquote><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
62
+ assert.deepStrictEqual(inspect(parser('>> a\n> b'), ctx), [['<blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote>'], '']);
63
+ assert.deepStrictEqual(inspect(parser('>> a\n>>> b\n> c'), ctx), [['<blockquote><blockquote><pre>a</pre><blockquote><pre>b</pre></blockquote></blockquote><pre>c</pre></blockquote>'], '']);
64
+ assert.deepStrictEqual(inspect(parser('>> a\n> b\n>>> c'), ctx), [['<blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre><blockquote><blockquote><pre>c</pre></blockquote></blockquote></blockquote>'], '']);
65
+ assert.deepStrictEqual(inspect(parser('>>> a\n>> b\n> c'), ctx), [['<blockquote><blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
64
66
  });
65
67
 
66
68
  it('markdown', () => {
67
- assert.deepStrictEqual(inspect(parser('!')), undefined);
68
- assert.deepStrictEqual(inspect(parser('!>')), undefined);
69
- assert.deepStrictEqual(inspect(parser('!> ')), [['<blockquote></blockquote>'], '']);
70
- assert.deepStrictEqual(inspect(parser('!> \\')), [['<blockquote><section><p>\\</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
71
- assert.deepStrictEqual(inspect(parser('!> \\\n')), [['<blockquote><section><p>\\</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
72
- assert.deepStrictEqual(inspect(parser('!> a')), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
73
- assert.deepStrictEqual(inspect(parser('!> a\n')), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
74
- assert.deepStrictEqual(inspect(parser('!> a\\\nb')), [['<blockquote><section><p>a<br>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
75
- assert.deepStrictEqual(inspect(parser('!> ++a\nb++')), [['<blockquote><section><p><ins>a<br>b</ins></p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
76
- assert.deepStrictEqual(inspect(parser('!> ++a\n> b++')), [['<blockquote><section><p><ins>a<br>b</ins></p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
77
- assert.deepStrictEqual(inspect(parser('!> a \n b c ')), [['<blockquote><section><p> a<br> b c</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
78
- assert.deepStrictEqual(inspect(parser('!>> a')), [['<blockquote><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote></blockquote>'], '']);
79
- assert.deepStrictEqual(inspect(parser('!>> a\n> b')), [['<blockquote><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote><section><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
80
- assert.deepStrictEqual(inspect(parser('!> - a')), [['<blockquote><section><ul><li>a</li></ul><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
81
- assert.deepStrictEqual(inspect(parser('!> ```\na\n```')), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
82
- assert.deepStrictEqual(inspect(parser('!> ```\n> a\n```')), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
83
- assert.deepStrictEqual(inspect(parser('!> ```\n> a\n> ```')), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
84
- assert.deepStrictEqual(inspect(parser('!> ```\n> a\n> \n> b\n> ```')), [['<blockquote><section><pre class="text">a<br><br>b</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
85
- assert.deepStrictEqual(inspect(parser('!> a\n>\n> b')), [['<blockquote><section><p>a</p><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
86
- assert.deepStrictEqual(inspect(parser('!> > a')), [['<blockquote><section><blockquote><pre>a</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
87
- assert.deepStrictEqual(inspect(parser('!> > a\n> b')), [['<blockquote><section><blockquote><pre>a<br>b</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
88
- assert.deepStrictEqual(inspect(parser('!> > a\n> > b')), [['<blockquote><section><blockquote><pre>a<br>b</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
89
- assert.deepStrictEqual(inspect(parser('!> > a\n>> b')), [['<blockquote><section><blockquote><pre>a</pre></blockquote><h2>References</h2><ol class="references"></ol></section><blockquote><section><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote></blockquote>'], '']);
90
- assert.deepStrictEqual(inspect(parser('!>> > a\n> b')), [['<blockquote><blockquote><section><blockquote><pre>a</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote><section><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
91
- assert.deepStrictEqual(inspect(parser('!> !> a')), [['<blockquote><section><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
92
- assert.deepStrictEqual(inspect(parser('!> \na')), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
93
- assert.deepStrictEqual(inspect(parser('!>\n')), undefined);
94
- assert.deepStrictEqual(inspect(parser('!>\na')), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
95
- assert.deepStrictEqual(inspect(parser('!>\n a')), [['<blockquote><section><p> a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
96
- assert.deepStrictEqual(inspect(parser('!>\n>')), [['<blockquote><section><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
97
- assert.deepStrictEqual(inspect(parser('!>\n> a')), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
98
- assert.deepStrictEqual(inspect(parser('!>> ## a\n> ## a')), [['<blockquote><blockquote><section><h2>a</h2><h2>References</h2><ol class="references"></ol></section></blockquote><section><h2>a</h2><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
99
- assert.deepStrictEqual(inspect(parser('!>> ~ a\n> ~ a')), [['<blockquote><blockquote><section><dl><dt>a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote><section><dl><dt>a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
100
- assert.deepStrictEqual(inspect(parser('!>> ~~~figure $test-a\n>> > \n>>\n~~~\n> ~~~figure $test-a\n> > \n>\n[#a]\n~~~')), [['<blockquote><blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1"><figcaption><span class="figindex">Test 1. </span><span class="figtext"></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1"><figcaption><span class="figindex">Test 1. </span><span class="figtext"><a class="index">a</a></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
101
- assert.deepStrictEqual(inspect(parser('!>> ((a))\n> ((a))')), [['<blockquote><blockquote><section><p><sup class="annotation disabled" title="a"><span></span><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>a</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote><section><p><sup class="annotation disabled" title="a"><span></span><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>a</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
69
+ assert.deepStrictEqual(inspect(parser('!'), ctx), undefined);
70
+ assert.deepStrictEqual(inspect(parser('!>'), ctx), undefined);
71
+ assert.deepStrictEqual(inspect(parser('!> '), ctx), [['<blockquote></blockquote>'], '']);
72
+ assert.deepStrictEqual(inspect(parser('!> \\'), ctx), [['<blockquote><section><p>\\</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
73
+ assert.deepStrictEqual(inspect(parser('!> \\\n'), ctx), [['<blockquote><section><p>\\</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
74
+ assert.deepStrictEqual(inspect(parser('!> a'), ctx), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
75
+ assert.deepStrictEqual(inspect(parser('!> a\n'), ctx), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
76
+ assert.deepStrictEqual(inspect(parser('!> a\\\nb'), ctx), [['<blockquote><section><p>a<br>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
77
+ assert.deepStrictEqual(inspect(parser('!> ++a\nb++'), ctx), [['<blockquote><section><p><ins>a<br>b</ins></p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
78
+ assert.deepStrictEqual(inspect(parser('!> ++a\n> b++'), ctx), [['<blockquote><section><p><ins>a<br>b</ins></p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
79
+ assert.deepStrictEqual(inspect(parser('!> a \n b c '), ctx), [['<blockquote><section><p> a<br> b c</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
80
+ assert.deepStrictEqual(inspect(parser('!>> a'), ctx), [['<blockquote><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote></blockquote>'], '']);
81
+ assert.deepStrictEqual(inspect(parser('!>> a\n> b'), ctx), [['<blockquote><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote><section><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
82
+ assert.deepStrictEqual(inspect(parser('!> - a'), ctx), [['<blockquote><section><ul><li>a</li></ul><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
83
+ assert.deepStrictEqual(inspect(parser('!> ```\na\n```'), ctx), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
84
+ assert.deepStrictEqual(inspect(parser('!> ```\n> a\n```'), ctx), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
85
+ assert.deepStrictEqual(inspect(parser('!> ```\n> a\n> ```'), ctx), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
86
+ assert.deepStrictEqual(inspect(parser('!> ```\n> a\n> \n> b\n> ```'), ctx), [['<blockquote><section><pre class="text">a<br><br>b</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
87
+ assert.deepStrictEqual(inspect(parser('!> a\n>\n> b'), ctx), [['<blockquote><section><p>a</p><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
88
+ assert.deepStrictEqual(inspect(parser('!> > a'), ctx), [['<blockquote><section><blockquote><pre>a</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
89
+ assert.deepStrictEqual(inspect(parser('!> > a\n> b'), ctx), [['<blockquote><section><blockquote><pre>a<br>b</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
90
+ assert.deepStrictEqual(inspect(parser('!> > a\n> > b'), ctx), [['<blockquote><section><blockquote><pre>a<br>b</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
91
+ assert.deepStrictEqual(inspect(parser('!> > a\n>> b'), ctx), [['<blockquote><section><blockquote><pre>a</pre></blockquote><h2>References</h2><ol class="references"></ol></section><blockquote><section><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote></blockquote>'], '']);
92
+ assert.deepStrictEqual(inspect(parser('!>> > a\n> b'), ctx), [['<blockquote><blockquote><section><blockquote><pre>a</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote><section><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
93
+ assert.deepStrictEqual(inspect(parser('!> !> a'), ctx), [['<blockquote><section><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
94
+ assert.deepStrictEqual(inspect(parser('!> \na'), ctx), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
95
+ assert.deepStrictEqual(inspect(parser('!>\n'), ctx), undefined);
96
+ assert.deepStrictEqual(inspect(parser('!>\na'), ctx), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
97
+ assert.deepStrictEqual(inspect(parser('!>\n a'), ctx), [['<blockquote><section><p> a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
98
+ assert.deepStrictEqual(inspect(parser('!>\n>'), ctx), [['<blockquote><section><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
99
+ assert.deepStrictEqual(inspect(parser('!>\n> a'), ctx), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
100
+ assert.deepStrictEqual(inspect(parser('!>> ## a\n> ## a'), ctx), [['<blockquote><blockquote><section><h2>a</h2><h2>References</h2><ol class="references"></ol></section></blockquote><section><h2>a</h2><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
101
+ assert.deepStrictEqual(inspect(parser('!>> ~ a\n> ~ a'), ctx), [['<blockquote><blockquote><section><dl><dt>a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote><section><dl><dt>a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
102
+ assert.deepStrictEqual(inspect(parser('!>> ~~~figure $test-a\n>> > \n>>\n~~~\n> ~~~figure $test-a\n> > \n>\n[#a]\n~~~'), ctx), [['<blockquote><blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1"><figcaption><span class="figindex">Test 1. </span><span class="figtext"></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1"><figcaption><span class="figindex">Test 1. </span><span class="figtext"><a class="index">a</a></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
103
+ assert.deepStrictEqual(inspect(parser('!>> ((a))\n> ((a))'), ctx), [['<blockquote><blockquote><section><p><sup class="annotation disabled" title="a"><span></span><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>a</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote><section><p><sup class="annotation disabled" title="a"><span></span><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>a</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
102
104
  });
103
105
 
104
106
  });
@@ -6,17 +6,17 @@ import { contentline } from '../source';
6
6
  import { parse } from '../api/parse';
7
7
  import { html, defrag } from 'typed-dom/dom';
8
8
 
9
- export const segment: BlockquoteParser.SegmentParser = block(validate(['!>', '>'], union([
10
- validate(/^!?>+(?=[^\S\n]|\n[^\S\n]*\S)/, some(contentline)),
9
+ export const segment: BlockquoteParser.SegmentParser = block(validate(/!?>/y, union([
10
+ validate(/!?>+(?=[^\S\n]|\n[^\S\n]*\S)/y, some(contentline)),
11
11
  ])));
12
12
 
13
13
  export const blockquote: BlockquoteParser = lazy(() => block(rewrite(segment, union([
14
- open(/^(?=>)/, source),
15
- open(/^!(?=>)/, markdown),
14
+ open(/(?=>)/y, source),
15
+ open(/!(?=>)/y, markdown),
16
16
  ]))));
17
17
 
18
- const opener = /^(?=>>+(?:$|\s))/;
19
- const indent = block(open(opener, some(contentline, /^>(?:$|\s)/)), false);
18
+ const opener = /(?=>>+(?:$|\s))/y;
19
+ const indent = block(open(opener, some(contentline, />(?:$|\s)/y)), false);
20
20
  const unindent = (source: string) => source.replace(/(?<=^|\n)>(?:[^\S\n]|(?=>*(?:$|\s)))|\n$/g, '');
21
21
 
22
22
  const source: BlockquoteParser.SourceParser = lazy(() => fmap(
@@ -38,7 +38,8 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
38
38
  creation(10,
39
39
  rewrite(
40
40
  some(contentline, opener),
41
- convert(unindent, ({ source, context }) => {
41
+ convert(unindent, ({ context }) => {
42
+ const { source } = context;
42
43
  const references = html('ol', { class: 'references' });
43
44
  const document = parse(source, {
44
45
  id: '',
@@ -46,7 +47,8 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
46
47
  references,
47
48
  },
48
49
  }, context);
49
- return [[html('section', [document, html('h2', 'References'), references])], ''];
50
+ context.position = source.length;
51
+ return [[html('section', [document, html('h2', 'References'), references])]];
50
52
  }, false, true))),
51
53
  ]))),
52
54
  ns => [html('blockquote', ns)]));
@@ -1,73 +1,75 @@
1
1
  import { codeblock } from './codeblock';
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/block/codeblock', () => {
6
7
  describe('codeblock', () => {
7
- const parser = (source: string) => some(codeblock)({ source, context: {} });
8
+ const parser = (source: string) => some(codeblock)(input(source, ctx));
9
+ const { context: ctx } = input('', {});
8
10
 
9
11
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('')), undefined);
11
- assert.deepStrictEqual(inspect(parser('\n')), undefined);
12
- assert.deepStrictEqual(inspect(parser('```')), undefined);
13
- assert.deepStrictEqual(inspect(parser('```\n')), undefined);
14
- assert.deepStrictEqual(inspect(parser('```\na')), [['<pre class="invalid" translate="no">```\na</pre>'], '']);
15
- assert.deepStrictEqual(inspect(parser('```\na```')), [['<pre class="invalid" translate="no">```\na```</pre>'], '']);
16
- assert.deepStrictEqual(inspect(parser('```\na\n```b')), [['<pre class="invalid" translate="no">```\na\n```b</pre>'], '']);
17
- assert.deepStrictEqual(inspect(parser('```\na\n```\nb')), [['<pre class="invalid" translate="no">```\na\n```\nb</pre>'], '']);
18
- assert.deepStrictEqual(inspect(parser('```\n\n\n```')), undefined);
19
- assert.deepStrictEqual(inspect(parser('```a ```\n```')), undefined);
20
- assert.deepStrictEqual(inspect(parser('```\n```\n```')), [['<pre class="invalid" translate="no">```\n```\n```</pre>'], '']);
21
- assert.deepStrictEqual(inspect(parser('```\n````')), [['<pre class="invalid" translate="no">```\n````</pre>'], '']);
22
- assert.deepStrictEqual(inspect(parser('````\n```')), [['<pre class="invalid" translate="no">````\n```</pre>'], '']);
23
- assert.deepStrictEqual(inspect(parser(' ```\n```')), undefined);
24
- assert.deepStrictEqual(inspect(parser(`\`\`\`\n0${'\n'.repeat(301)}\`\`\``), '>'), [['<pre class="invalid" translate="no">'], '']);
12
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
+ assert.deepStrictEqual(inspect(parser('\n'), ctx), undefined);
14
+ assert.deepStrictEqual(inspect(parser('```'), ctx), undefined);
15
+ assert.deepStrictEqual(inspect(parser('```\n'), ctx), undefined);
16
+ assert.deepStrictEqual(inspect(parser('```\na'), ctx), [['<pre class="invalid" translate="no">```\na</pre>'], '']);
17
+ assert.deepStrictEqual(inspect(parser('```\na```'), ctx), [['<pre class="invalid" translate="no">```\na```</pre>'], '']);
18
+ assert.deepStrictEqual(inspect(parser('```\na\n```b'), ctx), [['<pre class="invalid" translate="no">```\na\n```b</pre>'], '']);
19
+ assert.deepStrictEqual(inspect(parser('```\na\n```\nb'), ctx), [['<pre class="invalid" translate="no">```\na\n```\nb</pre>'], '']);
20
+ assert.deepStrictEqual(inspect(parser('```\n\n\n```'), ctx), undefined);
21
+ assert.deepStrictEqual(inspect(parser('```a ```\n```'), ctx), undefined);
22
+ assert.deepStrictEqual(inspect(parser('```\n```\n```'), ctx), [['<pre class="invalid" translate="no">```\n```\n```</pre>'], '']);
23
+ assert.deepStrictEqual(inspect(parser('```\n````'), ctx), [['<pre class="invalid" translate="no">```\n````</pre>'], '']);
24
+ assert.deepStrictEqual(inspect(parser('````\n```'), ctx), [['<pre class="invalid" translate="no">````\n```</pre>'], '']);
25
+ assert.deepStrictEqual(inspect(parser(' ```\n```'), ctx), undefined);
26
+ assert.deepStrictEqual(inspect(parser(`\`\`\`\n0${'\n'.repeat(301)}\`\`\``), ctx, '>'), [['<pre class="invalid" translate="no">'], '']);
25
27
  });
26
28
 
27
29
  it('basic', () => {
28
- assert.deepStrictEqual(inspect(parser('```\n```')), [['<pre class="text"></pre>'], '']);
29
- assert.deepStrictEqual(inspect(parser('```\n\n```')), [['<pre class="text"></pre>'], '']);
30
- assert.deepStrictEqual(inspect(parser('```\na\n```')), [['<pre class="text">a</pre>'], '']);
31
- assert.deepStrictEqual(inspect(parser('```\na\nb\n```')), [['<pre class="text">a<br>b</pre>'], '']);
32
- assert.deepStrictEqual(inspect(parser('```\n\\\n```')), [['<pre class="text">\\</pre>'], '']);
33
- assert.deepStrictEqual(inspect(parser('```\n`\n```')), [['<pre class="text">`</pre>'], '']);
34
- assert.deepStrictEqual(inspect(parser('```\n```\n\n```')), [['<pre class="text"></pre>'], '\n```']);
35
- assert.deepStrictEqual(inspect(parser('```\n````\n```')), [['<pre class="text">````</pre>'], '']);
36
- assert.deepStrictEqual(inspect(parser('```\n````\n\n```')), [['<pre class="text">````<br></pre>'], '']);
37
- assert.deepStrictEqual(inspect(parser('````\n```\n````')), [['<pre class="text">```</pre>'], '']);
38
- assert.deepStrictEqual(inspect(parser('````\n```\n\n````')), [['<pre class="text">```<br></pre>'], '']);
39
- assert.deepStrictEqual(inspect(parser('```\n\n```\n')), [['<pre class="text"></pre>'], '']);
40
- assert.deepStrictEqual(inspect(parser('```\nhttp://host\n```')), [['<pre class="text"><a class="url" href="http://host" target="_blank">http://host</a></pre>'], '']);
41
- assert.deepStrictEqual(inspect(parser('```\nhttp://host)\n```')), [['<pre class="text"><a class="url" href="http://host)" target="_blank">http://host)</a></pre>'], '']);
42
- assert.deepStrictEqual(inspect(parser('```\n!http://host\n```')), [['<pre class="text">!<a class="url" href="http://host" target="_blank">http://host</a></pre>'], '']);
43
- assert.deepStrictEqual(inspect(parser('```\n!http://host)\n```')), [['<pre class="text">!<a class="url" href="http://host)" target="_blank">http://host)</a></pre>'], '']);
44
- assert.deepStrictEqual(inspect(parser('```\n#a\n```')), [['<pre class="text"><a class="hashtag" href="/hashtags/a">#a</a></pre>'], '']);
45
- assert.deepStrictEqual(inspect(parser('```\n@a#b\n```')), [['<pre class="text"><a class="channel" href="/@a?ch=b">@a#b</a></pre>'], '']);
46
- assert.deepStrictEqual(inspect(parser(`\`\`\`\n0${'\n'.repeat(300)}\`\`\``), '>'), [['<pre class="text">'], '']);
30
+ assert.deepStrictEqual(inspect(parser('```\n```'), ctx), [['<pre class="text"></pre>'], '']);
31
+ assert.deepStrictEqual(inspect(parser('```\n\n```'), ctx), [['<pre class="text"></pre>'], '']);
32
+ assert.deepStrictEqual(inspect(parser('```\na\n```'), ctx), [['<pre class="text">a</pre>'], '']);
33
+ assert.deepStrictEqual(inspect(parser('```\na\nb\n```'), ctx), [['<pre class="text">a<br>b</pre>'], '']);
34
+ assert.deepStrictEqual(inspect(parser('```\n\\\n```'), ctx), [['<pre class="text">\\</pre>'], '']);
35
+ assert.deepStrictEqual(inspect(parser('```\n`\n```'), ctx), [['<pre class="text">`</pre>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('```\n```\n\n```'), ctx), [['<pre class="text"></pre>'], '\n```']);
37
+ assert.deepStrictEqual(inspect(parser('```\n````\n```'), ctx), [['<pre class="text">````</pre>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('```\n````\n\n```'), ctx), [['<pre class="text">````<br></pre>'], '']);
39
+ assert.deepStrictEqual(inspect(parser('````\n```\n````'), ctx), [['<pre class="text">```</pre>'], '']);
40
+ assert.deepStrictEqual(inspect(parser('````\n```\n\n````'), ctx), [['<pre class="text">```<br></pre>'], '']);
41
+ assert.deepStrictEqual(inspect(parser('```\n\n```\n'), ctx), [['<pre class="text"></pre>'], '']);
42
+ assert.deepStrictEqual(inspect(parser('```\nhttp://host\n```'), ctx), [['<pre class="text"><a class="url" href="http://host" target="_blank">http://host</a></pre>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('```\nhttp://host)\n```'), ctx), [['<pre class="text"><a class="url" href="http://host)" target="_blank">http://host)</a></pre>'], '']);
44
+ assert.deepStrictEqual(inspect(parser('```\n!http://host\n```'), ctx), [['<pre class="text">!<a class="url" href="http://host" target="_blank">http://host</a></pre>'], '']);
45
+ assert.deepStrictEqual(inspect(parser('```\n!http://host)\n```'), ctx), [['<pre class="text">!<a class="url" href="http://host)" target="_blank">http://host)</a></pre>'], '']);
46
+ assert.deepStrictEqual(inspect(parser('```\n#a\n```'), ctx), [['<pre class="text"><a class="hashtag" href="/hashtags/a">#a</a></pre>'], '']);
47
+ assert.deepStrictEqual(inspect(parser('```\n@a#b\n```'), ctx), [['<pre class="text"><a class="channel" href="/@a?ch=b">@a#b</a></pre>'], '']);
48
+ assert.deepStrictEqual(inspect(parser(`\`\`\`\n0${'\n'.repeat(300)}\`\`\``), ctx, '>'), [['<pre class="text">'], '']);
47
49
  });
48
50
 
49
51
  it('attribute', () => {
50
- assert.deepStrictEqual(inspect(parser('```0\n```')), [['<pre class="code language-0" translate="no" data-lang="0"></pre>'], '']);
51
- assert.deepStrictEqual(inspect(parser('```a\n```')), [['<pre class="code language-a" translate="no" data-lang="a"></pre>'], '']);
52
- assert.deepStrictEqual(inspect(parser('```A\n```')), [['<pre class="code language-a" translate="no" data-lang="a"></pre>'], '']);
53
- assert.deepStrictEqual(inspect(parser('```a-b\n```')), [['<pre class="code language-a-b" translate="no" data-lang="a-b"></pre>'], '']);
54
- assert.deepStrictEqual(inspect(parser('```a-b0\n```')), [['<pre class="code language-a-b0" translate="no" data-lang="a-b0"></pre>'], '']);
55
- assert.deepStrictEqual(inspect(parser('```a--b\n```')), [['<pre class="text" data-path="a--b"></pre>'], '']);
56
- assert.deepStrictEqual(inspect(parser('``` b\n```')), [['<pre class="text" data-path="b"></pre>'], '']);
57
- assert.deepStrictEqual(inspect(parser('``` b c\n```')), [['<pre class="invalid" translate="no">``` b c\n```</pre>'], '']);
58
- assert.deepStrictEqual(inspect(parser('``` b\\ c\n```')), [['<pre class="text" data-path="b\\ c"></pre>'], '']);
59
- assert.deepStrictEqual(inspect(parser('``` b.c\n```')), [['<pre class="code language-c" translate="no" data-lang="c" data-path="b.c"></pre>'], '']);
60
- assert.deepStrictEqual(inspect(parser('``` .b\n```')), [['<pre class="text" data-path=".b"></pre>'], '']);
61
- assert.deepStrictEqual(inspect(parser('``` b \n```')), [['<pre class="text" data-path="b"></pre>'], '']);
62
- assert.deepStrictEqual(inspect(parser('``` ~/.b\n```')), [['<pre class="text" data-path="~/.b"></pre>'], '']);
63
- assert.deepStrictEqual(inspect(parser('``` ~/b.c\n```')), [['<pre class="code language-c" translate="no" data-lang="c" data-path="~/b.c"></pre>'], '']);
64
- assert.deepStrictEqual(inspect(parser('```.b\n```')), [['<pre class="text" data-path=".b"></pre>'], '']);
65
- assert.deepStrictEqual(inspect(parser('```b.c\n```')), [['<pre class="code language-c" translate="no" data-lang="c" data-path="b.c"></pre>'], '']);
66
- assert.deepStrictEqual(inspect(parser('```a b.c\n```')), [['<pre class="code language-a" translate="no" data-lang="a" data-path="b.c"></pre>'], '']);
67
- assert.deepStrictEqual(inspect(parser('```a 1\n```')), [['<pre class="code language-a" translate="no" data-lang="a" data-line="1"></pre>'], '']);
68
- assert.deepStrictEqual(inspect(parser('``` 1\n```')), [['<pre class="text" data-line="1"></pre>'], '']);
69
- assert.deepStrictEqual(inspect(parser('``` 1,2-3\n```')), [['<pre class="text" data-line="1,2-3"></pre>'], '']);
70
- assert.deepStrictEqual(inspect(parser('``` 1 b.c\n```')), [['<pre class="code language-c" translate="no" data-lang="c" data-line="1" data-path="b.c"></pre>'], '']);
52
+ assert.deepStrictEqual(inspect(parser('```0\n```'), ctx), [['<pre class="code language-0" translate="no" data-lang="0"></pre>'], '']);
53
+ assert.deepStrictEqual(inspect(parser('```a\n```'), ctx), [['<pre class="code language-a" translate="no" data-lang="a"></pre>'], '']);
54
+ assert.deepStrictEqual(inspect(parser('```A\n```'), ctx), [['<pre class="code language-a" translate="no" data-lang="a"></pre>'], '']);
55
+ assert.deepStrictEqual(inspect(parser('```a-b\n```'), ctx), [['<pre class="code language-a-b" translate="no" data-lang="a-b"></pre>'], '']);
56
+ assert.deepStrictEqual(inspect(parser('```a-b0\n```'), ctx), [['<pre class="code language-a-b0" translate="no" data-lang="a-b0"></pre>'], '']);
57
+ assert.deepStrictEqual(inspect(parser('```a--b\n```'), ctx), [['<pre class="text" data-path="a--b"></pre>'], '']);
58
+ assert.deepStrictEqual(inspect(parser('``` b\n```'), ctx), [['<pre class="text" data-path="b"></pre>'], '']);
59
+ assert.deepStrictEqual(inspect(parser('``` b c\n```'), ctx), [['<pre class="invalid" translate="no">``` b c\n```</pre>'], '']);
60
+ assert.deepStrictEqual(inspect(parser('``` b\\ c\n```'), ctx), [['<pre class="text" data-path="b\\ c"></pre>'], '']);
61
+ assert.deepStrictEqual(inspect(parser('``` b.c\n```'), ctx), [['<pre class="code language-c" translate="no" data-lang="c" data-path="b.c"></pre>'], '']);
62
+ assert.deepStrictEqual(inspect(parser('``` .b\n```'), ctx), [['<pre class="text" data-path=".b"></pre>'], '']);
63
+ assert.deepStrictEqual(inspect(parser('``` b \n```'), ctx), [['<pre class="text" data-path="b"></pre>'], '']);
64
+ assert.deepStrictEqual(inspect(parser('``` ~/.b\n```'), ctx), [['<pre class="text" data-path="~/.b"></pre>'], '']);
65
+ assert.deepStrictEqual(inspect(parser('``` ~/b.c\n```'), ctx), [['<pre class="code language-c" translate="no" data-lang="c" data-path="~/b.c"></pre>'], '']);
66
+ assert.deepStrictEqual(inspect(parser('```.b\n```'), ctx), [['<pre class="text" data-path=".b"></pre>'], '']);
67
+ assert.deepStrictEqual(inspect(parser('```b.c\n```'), ctx), [['<pre class="code language-c" translate="no" data-lang="c" data-path="b.c"></pre>'], '']);
68
+ assert.deepStrictEqual(inspect(parser('```a b.c\n```'), ctx), [['<pre class="code language-a" translate="no" data-lang="a" data-path="b.c"></pre>'], '']);
69
+ assert.deepStrictEqual(inspect(parser('```a 1\n```'), ctx), [['<pre class="code language-a" translate="no" data-lang="a" data-line="1"></pre>'], '']);
70
+ assert.deepStrictEqual(inspect(parser('``` 1\n```'), ctx), [['<pre class="text" data-line="1"></pre>'], '']);
71
+ assert.deepStrictEqual(inspect(parser('``` 1,2-3\n```'), ctx), [['<pre class="text" data-line="1,2-3"></pre>'], '']);
72
+ assert.deepStrictEqual(inspect(parser('``` 1 b.c\n```'), ctx), [['<pre class="code language-c" translate="no" data-lang="c" data-line="1" data-path="b.c"></pre>'], '']);
71
73
  });
72
74
 
73
75
  });
@@ -1,11 +1,11 @@
1
1
  import { CodeBlockParser } from '../block';
2
- import { eval } from '../../combinator/data/parser';
2
+ import { input, eval } from '../../combinator/data/parser';
3
3
  import { block, validate, fence, clear, fmap } from '../../combinator';
4
4
  import { autolink } from '../autolink';
5
5
  import { invalid } from '../util';
6
6
  import { html, defrag } from 'typed-dom/dom';
7
7
 
8
- const opener = /^(`{3,})(?!`)([^\n]*)(?:$|\n)/;
8
+ const opener = /(`{3,})(?!`)([^\n]*)(?:$|\n)/y;
9
9
  const language = /^[0-9a-z]+(?:-[a-z][0-9a-z]*)*$/i;
10
10
 
11
11
  export const segment: CodeBlockParser.SegmentParser = block(validate('```',
@@ -17,7 +17,7 @@ export const segment_: CodeBlockParser.SegmentParser = block(validate('```',
17
17
  export const codeblock: CodeBlockParser = block(validate('```', fmap(
18
18
  fence(opener, 300),
19
19
  // Bug: Type mismatch between outer and inner.
20
- ([body, overflow, closer, opener, delim, param]: string[], _, context) => {
20
+ ([body, overflow, closer, opener, delim, param]: string[], context) => {
21
21
  const params = param.match(/(?:\\.?|\S)+/g)?.reduce<{
22
22
  lang?: string;
23
23
  path?: string;
@@ -72,6 +72,6 @@ export const codeblock: CodeBlockParser = block(validate('```', fmap(
72
72
  params.lang
73
73
  ? context.caches?.code?.get(`${params.lang ?? ''}\n${body.slice(0, -1)}`)?.cloneNode(true).childNodes ||
74
74
  body.slice(0, -1) || undefined
75
- : defrag(eval(autolink({ source: body.slice(0, -1), context }), [])));
75
+ : defrag(eval(autolink(input(body.slice(0, -1), { ...context })), [])));
76
76
  return [el];
77
77
  })));