securemark 0.299.3 → 0.300.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (241) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/design.md +0 -6
  3. package/dist/index.js +3479 -2750
  4. package/index.d.ts +2 -1
  5. package/index.ts +2 -2
  6. package/markdown.d.ts +209 -183
  7. package/package.json +1 -1
  8. package/src/{parser/api → api}/bind.test.ts +2 -24
  9. package/src/{parser/api → api}/bind.ts +18 -13
  10. package/src/{parser/api → api}/body.test.ts +1 -1
  11. package/src/{parser/api → api}/cache.ts +1 -1
  12. package/src/{parser/api → api}/header.test.ts +1 -1
  13. package/src/{parser/api → api}/header.ts +9 -6
  14. package/src/{parser/api → api}/normalize.test.ts +1 -1
  15. package/src/{parser/api → api}/parse.test.ts +120 -124
  16. package/src/api/parse.ts +30 -0
  17. package/src/api/run.ts +6 -0
  18. package/src/{parser/api.ts → api.ts} +1 -0
  19. package/src/combinator/control/inits.ts +26 -0
  20. package/src/combinator/control/sequence.test.ts +38 -0
  21. package/src/combinator/control/sequence.ts +17 -0
  22. package/src/combinator/control/some.test.ts +41 -0
  23. package/src/combinator/{data/parser → control}/some.ts +39 -26
  24. package/src/combinator/control/state.ts +42 -0
  25. package/src/combinator/control/subsequence.test.ts +47 -0
  26. package/src/combinator/control/subsequence.ts +16 -0
  27. package/src/combinator/control/tails.ts +8 -0
  28. package/src/combinator/control/union.test.ts +37 -0
  29. package/src/combinator/control/union.ts +18 -0
  30. package/src/combinator/{data/delimiter.ts → delimiter.ts} +40 -60
  31. package/src/combinator/effect/backtrack.ts +64 -0
  32. package/src/combinator/effect/clock.ts +10 -0
  33. package/src/combinator/effect/precedence.ts +50 -0
  34. package/src/combinator/effect/recursion.ts +30 -0
  35. package/src/combinator/effect/scope.ts +100 -0
  36. package/src/combinator/effect/state.ts +72 -0
  37. package/src/combinator/{data/node.ts → parser/list.ts} +38 -13
  38. package/src/combinator/parser.ts +293 -0
  39. package/src/combinator/process/bind.ts +34 -0
  40. package/src/combinator/process/block.test.ts +20 -0
  41. package/src/combinator/process/block.ts +33 -0
  42. package/src/combinator/process/clear.ts +16 -0
  43. package/src/combinator/process/contract.ts +35 -0
  44. package/src/combinator/process/duplicate.ts +7 -0
  45. package/src/combinator/process/error.ts +13 -0
  46. package/src/combinator/{control/manipulation → process}/fallback.ts +3 -3
  47. package/src/combinator/process/fence.ts +59 -0
  48. package/src/combinator/process/fmap.ts +10 -0
  49. package/src/combinator/process/indent.test.ts +31 -0
  50. package/src/combinator/process/indent.ts +51 -0
  51. package/src/combinator/process/lazy.ts +8 -0
  52. package/src/combinator/process/line.test.ts +21 -0
  53. package/src/combinator/process/line.ts +55 -0
  54. package/src/combinator/process/match.ts +37 -0
  55. package/src/combinator/process/reverse.ts +7 -0
  56. package/src/combinator/process/scope.ts +102 -0
  57. package/src/combinator/process/surround.ts +271 -0
  58. package/src/combinator.ts +28 -24
  59. package/src/debug.test.ts +11 -8
  60. package/src/parser/autolink.test.ts +17 -18
  61. package/src/parser/block/blockquote.test.ts +78 -79
  62. package/src/parser/block/blockquote.ts +32 -25
  63. package/src/parser/block/codeblock.test.ts +56 -57
  64. package/src/parser/block/codeblock.ts +44 -26
  65. package/src/parser/block/dlist.test.ts +56 -57
  66. package/src/parser/block/dlist.ts +5 -5
  67. package/src/parser/block/extension/aside.test.ts +8 -9
  68. package/src/parser/block/extension/aside.ts +76 -47
  69. package/src/parser/block/extension/example.test.ts +18 -19
  70. package/src/parser/block/extension/example.ts +88 -48
  71. package/src/parser/block/extension/fig.test.ts +37 -36
  72. package/src/parser/block/extension/fig.ts +20 -25
  73. package/src/parser/block/extension/figbase.test.ts +18 -19
  74. package/src/parser/block/extension/figbase.ts +3 -3
  75. package/src/parser/block/extension/figure.test.ts +62 -63
  76. package/src/parser/block/extension/figure.ts +23 -21
  77. package/src/parser/block/extension/message.test.ts +13 -14
  78. package/src/parser/block/extension/message.ts +52 -39
  79. package/src/parser/block/extension/placeholder.test.ts +13 -13
  80. package/src/parser/block/extension/placeholder.ts +23 -21
  81. package/src/parser/block/extension/table.test.ts +70 -71
  82. package/src/parser/block/extension/table.ts +43 -31
  83. package/src/parser/block/extension.test.ts +24 -24
  84. package/src/parser/block/extension.ts +3 -3
  85. package/src/parser/block/heading.test.ts +58 -59
  86. package/src/parser/block/heading.ts +19 -18
  87. package/src/parser/block/ilist.test.ts +8 -8
  88. package/src/parser/block/ilist.ts +9 -7
  89. package/src/parser/block/mathblock.test.ts +31 -32
  90. package/src/parser/block/mathblock.ts +24 -23
  91. package/src/parser/block/mediablock.ts +7 -7
  92. package/src/parser/block/olist.test.ts +102 -103
  93. package/src/parser/block/olist.ts +11 -12
  94. package/src/parser/block/pagebreak.test.ts +15 -16
  95. package/src/parser/block/pagebreak.ts +5 -5
  96. package/src/parser/block/paragraph.test.ts +57 -58
  97. package/src/parser/block/paragraph.ts +1 -1
  98. package/src/parser/block/reply/cite.test.ts +39 -40
  99. package/src/parser/block/reply/cite.ts +5 -5
  100. package/src/parser/block/reply/quote.test.ts +50 -51
  101. package/src/parser/block/reply/quote.ts +8 -7
  102. package/src/parser/block/reply.test.ts +19 -20
  103. package/src/parser/block/reply.ts +2 -2
  104. package/src/parser/block/sidefence.test.ts +41 -48
  105. package/src/parser/block/sidefence.ts +17 -11
  106. package/src/parser/block/table.test.ts +48 -49
  107. package/src/parser/block/table.ts +10 -9
  108. package/src/parser/block/ulist.test.ts +52 -53
  109. package/src/parser/block/ulist.ts +9 -8
  110. package/src/parser/block.ts +63 -51
  111. package/src/parser/context.ts +35 -32
  112. package/src/parser/document.ts +48 -0
  113. package/src/parser/header.test.ts +19 -20
  114. package/src/parser/header.ts +31 -25
  115. package/src/parser/inline/annotation.test.ts +49 -50
  116. package/src/parser/inline/annotation.ts +14 -16
  117. package/src/parser/inline/autolink/account.test.ts +32 -33
  118. package/src/parser/inline/autolink/account.ts +18 -19
  119. package/src/parser/inline/autolink/anchor.test.ts +21 -22
  120. package/src/parser/inline/autolink/anchor.ts +7 -8
  121. package/src/parser/inline/autolink/channel.test.ts +14 -15
  122. package/src/parser/inline/autolink/email.test.ts +36 -37
  123. package/src/parser/inline/autolink/email.ts +6 -6
  124. package/src/parser/inline/autolink/hashnum.test.ts +32 -33
  125. package/src/parser/inline/autolink/hashnum.ts +7 -8
  126. package/src/parser/inline/autolink/hashtag.test.ts +59 -60
  127. package/src/parser/inline/autolink/hashtag.ts +8 -9
  128. package/src/parser/inline/autolink/url.test.ts +75 -76
  129. package/src/parser/inline/autolink/url.ts +13 -14
  130. package/src/parser/inline/autolink.ts +24 -11
  131. package/src/parser/inline/bracket.test.ts +73 -74
  132. package/src/parser/inline/bracket.ts +88 -63
  133. package/src/parser/inline/code.test.ts +30 -31
  134. package/src/parser/inline/code.ts +6 -6
  135. package/src/parser/inline/deletion.test.ts +27 -28
  136. package/src/parser/inline/deletion.ts +5 -5
  137. package/src/parser/inline/emphasis.test.ts +39 -40
  138. package/src/parser/inline/emphasis.ts +5 -5
  139. package/src/parser/inline/emstrong.test.ts +101 -102
  140. package/src/parser/inline/emstrong.ts +103 -85
  141. package/src/parser/inline/extension/index.test.ts +91 -92
  142. package/src/parser/inline/extension/index.ts +17 -13
  143. package/src/parser/inline/extension/indexee.ts +4 -4
  144. package/src/parser/inline/extension/indexer.test.ts +23 -24
  145. package/src/parser/inline/extension/indexer.ts +6 -5
  146. package/src/parser/inline/extension/label.test.ts +32 -33
  147. package/src/parser/inline/extension/label.ts +14 -5
  148. package/src/parser/inline/extension/placeholder.test.ts +42 -43
  149. package/src/parser/inline/extension/placeholder.ts +8 -9
  150. package/src/parser/inline/html.test.ts +109 -109
  151. package/src/parser/inline/html.ts +27 -27
  152. package/src/parser/inline/htmlentity.test.ts +37 -38
  153. package/src/parser/inline/htmlentity.ts +6 -7
  154. package/src/parser/inline/insertion.test.ts +27 -28
  155. package/src/parser/inline/insertion.ts +5 -5
  156. package/src/parser/inline/italic.test.ts +55 -56
  157. package/src/parser/inline/italic.ts +5 -5
  158. package/src/parser/inline/link.test.ts +186 -187
  159. package/src/parser/inline/link.ts +31 -32
  160. package/src/parser/inline/mark.test.ts +31 -32
  161. package/src/parser/inline/mark.ts +6 -6
  162. package/src/parser/inline/math.test.ts +140 -141
  163. package/src/parser/inline/math.ts +6 -7
  164. package/src/parser/inline/media.test.ts +92 -93
  165. package/src/parser/inline/media.ts +32 -38
  166. package/src/parser/inline/reference.test.ts +111 -112
  167. package/src/parser/inline/reference.ts +61 -32
  168. package/src/parser/inline/remark.test.ts +49 -50
  169. package/src/parser/inline/remark.ts +13 -13
  170. package/src/parser/inline/ruby.test.ts +49 -50
  171. package/src/parser/inline/ruby.ts +60 -49
  172. package/src/parser/inline/shortmedia.test.ts +9 -10
  173. package/src/parser/inline/shortmedia.ts +11 -9
  174. package/src/parser/inline/strong.test.ts +36 -37
  175. package/src/parser/inline/strong.ts +5 -5
  176. package/src/parser/inline/template.test.ts +22 -23
  177. package/src/parser/inline/template.ts +13 -16
  178. package/src/parser/inline.test.ts +225 -226
  179. package/src/parser/inline.ts +68 -34
  180. package/src/parser/node.ts +1 -1
  181. package/src/parser/parser.ts +51 -0
  182. package/src/parser/repeat.ts +118 -91
  183. package/src/parser/segment.test.ts +0 -11
  184. package/src/parser/segment.ts +25 -28
  185. package/src/parser/source/escapable.test.ts +23 -24
  186. package/src/parser/source/escapable.ts +20 -20
  187. package/src/parser/source/line.test.ts +17 -18
  188. package/src/parser/source/line.ts +19 -24
  189. package/src/parser/source/str.ts +17 -10
  190. package/src/parser/source/text.test.ts +88 -89
  191. package/src/parser/source/text.ts +19 -20
  192. package/src/parser/source/unescapable.test.ts +23 -24
  193. package/src/parser/source/unescapable.ts +16 -16
  194. package/src/parser/util.ts +1 -1
  195. package/src/parser/visibility.ts +36 -15
  196. package/src/{parser/processor → processor}/figure.test.ts +23 -23
  197. package/src/{parser/processor → processor}/figure.ts +20 -12
  198. package/src/{parser/processor → processor}/note.test.ts +15 -15
  199. package/src/{parser/processor → processor}/note.ts +6 -4
  200. package/src/renderer/render/media/pdf.ts +2 -2
  201. package/src/renderer/render/media/twitter.ts +2 -2
  202. package/src/renderer/render/media.test.ts +12 -13
  203. package/src/renderer/render.test.ts +11 -11
  204. package/src/util/info.test.ts +2 -2
  205. package/src/util/quote.test.ts +3 -3
  206. package/src/util/quote.ts +6 -5
  207. package/src/util/toc.test.ts +12 -12
  208. package/src/combinator/control/constraint/block.test.ts +0 -20
  209. package/src/combinator/control/constraint/block.ts +0 -28
  210. package/src/combinator/control/constraint/contract.ts +0 -27
  211. package/src/combinator/control/constraint/line.test.ts +0 -21
  212. package/src/combinator/control/constraint/line.ts +0 -42
  213. package/src/combinator/control/manipulation/clear.ts +0 -5
  214. package/src/combinator/control/manipulation/convert.ts +0 -22
  215. package/src/combinator/control/manipulation/duplicate.ts +0 -7
  216. package/src/combinator/control/manipulation/fence.ts +0 -54
  217. package/src/combinator/control/manipulation/indent.test.ts +0 -31
  218. package/src/combinator/control/manipulation/indent.ts +0 -39
  219. package/src/combinator/control/manipulation/lazy.ts +0 -8
  220. package/src/combinator/control/manipulation/match.ts +0 -27
  221. package/src/combinator/control/manipulation/recovery.ts +0 -18
  222. package/src/combinator/control/manipulation/reverse.ts +0 -8
  223. package/src/combinator/control/manipulation/scope.ts +0 -61
  224. package/src/combinator/control/manipulation/surround.ts +0 -223
  225. package/src/combinator/control/monad/bind.ts +0 -26
  226. package/src/combinator/control/monad/fmap.ts +0 -10
  227. package/src/combinator/data/parser/context.ts +0 -96
  228. package/src/combinator/data/parser/inits.ts +0 -20
  229. package/src/combinator/data/parser/sequence.test.ts +0 -33
  230. package/src/combinator/data/parser/sequence.ts +0 -20
  231. package/src/combinator/data/parser/some.test.ts +0 -37
  232. package/src/combinator/data/parser/subsequence.test.ts +0 -41
  233. package/src/combinator/data/parser/subsequence.ts +0 -13
  234. package/src/combinator/data/parser/tails.ts +0 -8
  235. package/src/combinator/data/parser/union.test.ts +0 -33
  236. package/src/combinator/data/parser/union.ts +0 -18
  237. package/src/combinator/data/parser.ts +0 -144
  238. package/src/parser/api/parse.ts +0 -48
  239. package/src/parser.ts +0 -1
  240. /package/src/{parser/api → api}/body.ts +0 -0
  241. /package/src/{parser/api → api}/normalize.ts +0 -0
@@ -1,7 +1,6 @@
1
1
  import { blockquote } from './blockquote';
2
2
  import { some } from '../../combinator';
3
- import { input } from '../../combinator/data/parser';
4
- import { Context } from '../context';
3
+ import { input } from '../context';
5
4
  import { inspect } from '../../debug.test';
6
5
 
7
6
  describe('Unit: parser/block/blockquote', () => {
@@ -9,92 +8,92 @@ describe('Unit: parser/block/blockquote', () => {
9
8
  const parser = some(blockquote);
10
9
 
11
10
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
13
- assert.deepStrictEqual(inspect(parser, input('\n', new Context())), undefined);
14
- assert.deepStrictEqual(inspect(parser, input('>', new Context())), undefined);
15
- assert.deepStrictEqual(inspect(parser, input('>a', new Context())), undefined);
16
- assert.deepStrictEqual(inspect(parser, input('>\n', new Context())), undefined);
17
- assert.deepStrictEqual(inspect(parser, input('>\na', new Context())), undefined);
18
- assert.deepStrictEqual(inspect(parser, input('!>\n', new Context())), undefined);
19
- assert.deepStrictEqual(inspect(parser, input('!>\na', new Context())), undefined);
20
- assert.deepStrictEqual(inspect(parser, input(' > ', new Context())), undefined);
21
- assert.deepStrictEqual(inspect(parser, input('>>', new Context())), undefined);
11
+ assert.deepStrictEqual(inspect(parser, input('')), undefined);
12
+ assert.deepStrictEqual(inspect(parser, input('\n')), undefined);
13
+ assert.deepStrictEqual(inspect(parser, input('>')), undefined);
14
+ assert.deepStrictEqual(inspect(parser, input('>a')), undefined);
15
+ assert.deepStrictEqual(inspect(parser, input('>\n')), undefined);
16
+ assert.deepStrictEqual(inspect(parser, input('>\na')), undefined);
17
+ assert.deepStrictEqual(inspect(parser, input('!>\n')), undefined);
18
+ assert.deepStrictEqual(inspect(parser, input('!>\na')), undefined);
19
+ assert.deepStrictEqual(inspect(parser, input(' > ')), undefined);
20
+ assert.deepStrictEqual(inspect(parser, input('>>')), undefined);
22
21
  });
23
22
 
24
23
  it('basic', () => {
25
- assert.deepStrictEqual(inspect(parser, input('> ', new Context())), [['<blockquote></blockquote>'], '']);
26
- assert.deepStrictEqual(inspect(parser, input('> \\', new Context())), [['<blockquote><pre>\\</pre></blockquote>'], '']);
27
- assert.deepStrictEqual(inspect(parser, input('> \\\n', new Context())), [['<blockquote><pre>\\</pre></blockquote>'], '']);
28
- assert.deepStrictEqual(inspect(parser, input('> a', new Context())), [['<blockquote><pre>a</pre></blockquote>'], '']);
29
- assert.deepStrictEqual(inspect(parser, input('> a\n', new Context())), [['<blockquote><pre>a</pre></blockquote>'], '']);
30
- assert.deepStrictEqual(inspect(parser, input('> a\nb', new Context())), [['<blockquote><pre>a<br>b</pre></blockquote>'], '']);
31
- assert.deepStrictEqual(inspect(parser, input('> a\n b ', new Context())), [['<blockquote><pre>a<br> b </pre></blockquote>'], '']);
32
- assert.deepStrictEqual(inspect(parser, input('> a\n>', new Context())), [['<blockquote><pre>a<br></pre></blockquote>'], '']);
33
- assert.deepStrictEqual(inspect(parser, input('> a\n>>1', new Context())), [['<blockquote><pre>a<br><a class="anchor" href="?at=1">&gt;&gt;1</a></pre></blockquote>'], '']);
34
- assert.deepStrictEqual(inspect(parser, input('> a\n> b ', new Context())), [['<blockquote><pre>a<br>b </pre></blockquote>'], '']);
35
- assert.deepStrictEqual(inspect(parser, input('> a\n>\n', new Context())), [['<blockquote><pre>a<br></pre></blockquote>'], '']);
36
- assert.deepStrictEqual(inspect(parser, input('> a\n>\nb', new Context())), [['<blockquote><pre>a<br><br>b</pre></blockquote>'], '']);
37
- assert.deepStrictEqual(inspect(parser, input('> a\n>\n b ', new Context())), [['<blockquote><pre>a<br><br> b </pre></blockquote>'], '']);
38
- assert.deepStrictEqual(inspect(parser, input('> a\n>\n>', new Context())), [['<blockquote><pre>a<br><br></pre></blockquote>'], '']);
39
- assert.deepStrictEqual(inspect(parser, input('> a\n>\n>>1', new Context())), [['<blockquote><pre>a<br><br><a class="anchor" href="?at=1">&gt;&gt;1</a></pre></blockquote>'], '']);
40
- assert.deepStrictEqual(inspect(parser, input('> a\n>\n> b ', new Context())), [['<blockquote><pre>a<br><br>b </pre></blockquote>'], '']);
41
- assert.deepStrictEqual(inspect(parser, input('> a\\\nb', new Context())), [['<blockquote><pre>a\\<br>b</pre></blockquote>'], '']);
42
- assert.deepStrictEqual(inspect(parser, input('> a ', new Context())), [['<blockquote><pre> a </pre></blockquote>'], '']);
43
- assert.deepStrictEqual(inspect(parser, input('> \na', new Context())), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
44
- assert.deepStrictEqual(inspect(parser, input('> http://host', new Context())), [['<blockquote><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
45
- assert.deepStrictEqual(inspect(parser, input('> http://host)', new Context())), [['<blockquote><pre><a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
46
- assert.deepStrictEqual(inspect(parser, input('> !http://host', new Context())), [['<blockquote><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
47
- assert.deepStrictEqual(inspect(parser, input('> !http://host)', new Context())), [['<blockquote><pre>!<a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
48
- assert.deepStrictEqual(inspect(parser, input('> #a', new Context())), [['<blockquote><pre><a class="hashtag" href="/hashtags/a">#a</a></pre></blockquote>'], '']);
49
- assert.deepStrictEqual(inspect(parser, input('> @a#b', new Context())), [['<blockquote><pre><a class="channel" href="/@a?ch=b">@a#b</a></pre></blockquote>'], '']);
50
- assert.deepStrictEqual(inspect(parser, input('> >>1\n> > b', new Context())), [['<blockquote><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>&gt; b</pre></blockquote>'], '']);
51
- assert.deepStrictEqual(inspect(parser, input('> >>1\n> > b\n> c', new Context())), [['<blockquote><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>&gt; b<br>c</pre></blockquote>'], '']);
24
+ assert.deepStrictEqual(inspect(parser, input('> ')), [['<blockquote></blockquote>'], '']);
25
+ assert.deepStrictEqual(inspect(parser, input('> \\')), [['<blockquote><pre>\\</pre></blockquote>'], '']);
26
+ assert.deepStrictEqual(inspect(parser, input('> \\\n')), [['<blockquote><pre>\\</pre></blockquote>'], '']);
27
+ assert.deepStrictEqual(inspect(parser, input('> a')), [['<blockquote><pre>a</pre></blockquote>'], '']);
28
+ assert.deepStrictEqual(inspect(parser, input('> a\n')), [['<blockquote><pre>a</pre></blockquote>'], '']);
29
+ assert.deepStrictEqual(inspect(parser, input('> a\nb')), [['<blockquote><pre>a<br>b</pre></blockquote>'], '']);
30
+ assert.deepStrictEqual(inspect(parser, input('> a\n b ')), [['<blockquote><pre>a<br> b </pre></blockquote>'], '']);
31
+ assert.deepStrictEqual(inspect(parser, input('> a\n>')), [['<blockquote><pre>a<br></pre></blockquote>'], '']);
32
+ assert.deepStrictEqual(inspect(parser, input('> a\n>>1')), [['<blockquote><pre>a<br><a class="anchor" href="?at=1">&gt;&gt;1</a></pre></blockquote>'], '']);
33
+ assert.deepStrictEqual(inspect(parser, input('> a\n> b ')), [['<blockquote><pre>a<br>b </pre></blockquote>'], '']);
34
+ assert.deepStrictEqual(inspect(parser, input('> a\n>\n')), [['<blockquote><pre>a<br></pre></blockquote>'], '']);
35
+ assert.deepStrictEqual(inspect(parser, input('> a\n>\nb')), [['<blockquote><pre>a<br><br>b</pre></blockquote>'], '']);
36
+ assert.deepStrictEqual(inspect(parser, input('> a\n>\n b ')), [['<blockquote><pre>a<br><br> b </pre></blockquote>'], '']);
37
+ assert.deepStrictEqual(inspect(parser, input('> a\n>\n>')), [['<blockquote><pre>a<br><br></pre></blockquote>'], '']);
38
+ assert.deepStrictEqual(inspect(parser, input('> a\n>\n>>1')), [['<blockquote><pre>a<br><br><a class="anchor" href="?at=1">&gt;&gt;1</a></pre></blockquote>'], '']);
39
+ assert.deepStrictEqual(inspect(parser, input('> a\n>\n> b ')), [['<blockquote><pre>a<br><br>b </pre></blockquote>'], '']);
40
+ assert.deepStrictEqual(inspect(parser, input('> a\\\nb')), [['<blockquote><pre>a\\<br>b</pre></blockquote>'], '']);
41
+ assert.deepStrictEqual(inspect(parser, input('> a ')), [['<blockquote><pre> a </pre></blockquote>'], '']);
42
+ assert.deepStrictEqual(inspect(parser, input('> \na')), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
43
+ assert.deepStrictEqual(inspect(parser, input('> http://host')), [['<blockquote><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
44
+ assert.deepStrictEqual(inspect(parser, input('> http://host)')), [['<blockquote><pre><a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
45
+ assert.deepStrictEqual(inspect(parser, input('> !http://host')), [['<blockquote><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
46
+ assert.deepStrictEqual(inspect(parser, input('> !http://host)')), [['<blockquote><pre>!<a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
47
+ assert.deepStrictEqual(inspect(parser, input('> #a')), [['<blockquote><pre><a class="hashtag" href="/hashtags/a">#a</a></pre></blockquote>'], '']);
48
+ assert.deepStrictEqual(inspect(parser, input('> @a#b')), [['<blockquote><pre><a class="channel" href="/@a?ch=b">@a#b</a></pre></blockquote>'], '']);
49
+ assert.deepStrictEqual(inspect(parser, input('> >>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, input('> >>1\n> > b\n> c')), [['<blockquote><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>&gt; b<br>c</pre></blockquote>'], '']);
52
51
  });
53
52
 
54
53
  it('nest', () => {
55
- assert.deepStrictEqual(inspect(parser, input('> a\n>>', new Context())), [['<blockquote><pre>a</pre><blockquote></blockquote></blockquote>'], '']);
56
- assert.deepStrictEqual(inspect(parser, input('> a\n>> b\n> c', new Context())), [['<blockquote><pre>a</pre><blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
57
- assert.deepStrictEqual(inspect(parser, input('> a\n>> b\n>> c', new Context())), [['<blockquote><pre>a</pre><blockquote><pre>b<br>c</pre></blockquote></blockquote>'], '']);
58
- assert.deepStrictEqual(inspect(parser, input('> a\n>> b\n>>> c', new Context())), [['<blockquote><pre>a</pre><blockquote><pre>b</pre><blockquote><pre>c</pre></blockquote></blockquote></blockquote>'], '']);
59
- assert.deepStrictEqual(inspect(parser, input('>> a', new Context())), [['<blockquote><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
60
- assert.deepStrictEqual(inspect(parser, input('>> a\n>', new Context())), [['<blockquote><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
61
- assert.deepStrictEqual(inspect(parser, input('>> a\n> b', new Context())), [['<blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote>'], '']);
62
- assert.deepStrictEqual(inspect(parser, input('>> a\n>>> b\n> c', new Context())), [['<blockquote><blockquote><pre>a</pre><blockquote><pre>b</pre></blockquote></blockquote><pre>c</pre></blockquote>'], '']);
63
- assert.deepStrictEqual(inspect(parser, input('>> a\n> b\n>>> c', new Context())), [['<blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre><blockquote><blockquote><pre>c</pre></blockquote></blockquote></blockquote>'], '']);
64
- assert.deepStrictEqual(inspect(parser, input('>>> a\n>> b\n> c', new Context())), [['<blockquote><blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
54
+ assert.deepStrictEqual(inspect(parser, input('> a\n>>')), [['<blockquote><pre>a</pre><blockquote></blockquote></blockquote>'], '']);
55
+ assert.deepStrictEqual(inspect(parser, input('> a\n>> b\n> c')), [['<blockquote><pre>a</pre><blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
56
+ assert.deepStrictEqual(inspect(parser, input('> a\n>> b\n>> c')), [['<blockquote><pre>a</pre><blockquote><pre>b<br>c</pre></blockquote></blockquote>'], '']);
57
+ assert.deepStrictEqual(inspect(parser, input('> 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, input('>> a')), [['<blockquote><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
59
+ assert.deepStrictEqual(inspect(parser, input('>> a\n>')), [['<blockquote><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
60
+ assert.deepStrictEqual(inspect(parser, input('>> a\n> b')), [['<blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote>'], '']);
61
+ assert.deepStrictEqual(inspect(parser, input('>> 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, input('>> 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, input('>>> a\n>> b\n> c')), [['<blockquote><blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
65
64
  });
66
65
 
67
66
  it('markdown', () => {
68
- assert.deepStrictEqual(inspect(parser, input('!', new Context())), undefined);
69
- assert.deepStrictEqual(inspect(parser, input('!>', new Context())), undefined);
70
- assert.deepStrictEqual(inspect(parser, input('!> ', new Context())), [['<blockquote></blockquote>'], '']);
71
- assert.deepStrictEqual(inspect(parser, input('!> \\', new Context())), [['<blockquote><section><p>\\</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
72
- assert.deepStrictEqual(inspect(parser, input('!> \\\n', new Context())), [['<blockquote><section><p>\\</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
73
- assert.deepStrictEqual(inspect(parser, input('!> a', new Context())), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
74
- assert.deepStrictEqual(inspect(parser, input('!> a\n', new Context())), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
75
- assert.deepStrictEqual(inspect(parser, input('!> a\\\nb', new Context())), [['<blockquote><section><p>a<br>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
76
- assert.deepStrictEqual(inspect(parser, input('!> ++a\nb++', new Context())), [['<blockquote><section><p><ins>a<br>b</ins></p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
77
- assert.deepStrictEqual(inspect(parser, input('!> ++a\n> b++', new Context())), [['<blockquote><section><p><ins>a<br>b</ins></p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
78
- assert.deepStrictEqual(inspect(parser, input('!> a \n b c ', new Context())), [['<blockquote><section><p> a<br> b c</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
79
- assert.deepStrictEqual(inspect(parser, input('!>> a', new Context())), [['<blockquote><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote></blockquote>'], '']);
80
- assert.deepStrictEqual(inspect(parser, input('!>> a\n> b', new Context())), [['<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>'], '']);
81
- assert.deepStrictEqual(inspect(parser, input('!> - a', new Context())), [['<blockquote><section><ul><li id="index:random:a" class="local">a</li></ul><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
82
- assert.deepStrictEqual(inspect(parser, input('!> ```\na\n```', new Context())), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
83
- assert.deepStrictEqual(inspect(parser, input('!> ```\n> a\n```', new Context())), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
84
- assert.deepStrictEqual(inspect(parser, input('!> ```\n> a\n> ```', new Context())), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
85
- assert.deepStrictEqual(inspect(parser, input('!> ```\n> a\n> \n> b\n> ```', new Context())), [['<blockquote><section><pre class="text">a<br><br>b</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
86
- assert.deepStrictEqual(inspect(parser, input('!> a\n>\n> b', new Context())), [['<blockquote><section><p>a</p><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
87
- assert.deepStrictEqual(inspect(parser, input('!> > a', new Context())), [['<blockquote><section><blockquote><pre>a</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
88
- assert.deepStrictEqual(inspect(parser, input('!> > a\n> b', new Context())), [['<blockquote><section><blockquote><pre>a<br>b</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
89
- assert.deepStrictEqual(inspect(parser, input('!> > a\n> > b', new Context())), [['<blockquote><section><blockquote><pre>a<br>b</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
90
- assert.deepStrictEqual(inspect(parser, input('!> > a\n>> b', new Context())), [['<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>'], '']);
91
- assert.deepStrictEqual(inspect(parser, input('!>> > a\n> b', new Context())), [['<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>'], '']);
92
- assert.deepStrictEqual(inspect(parser, input('!> !> a', new Context())), [['<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>'], '']);
93
- assert.deepStrictEqual(inspect(parser, input('!> \na', new Context())), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
94
- assert.deepStrictEqual(inspect(parser, input('!>> ## a\n> ## a', new Context())), [['<blockquote><blockquote><section><h2 id="index:random:a" class="local">a</h2><h2>References</h2><ol class="references"></ol></section></blockquote><section><h2 id="index:random:a" class="local">a</h2><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
95
- assert.deepStrictEqual(inspect(parser, input('!>> ~ a\n> ~ a', new Context())), [['<blockquote><blockquote><section><dl><dt id="index:random:a" class="local">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote><section><dl><dt id="index:random:a" class="local">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
96
- assert.deepStrictEqual(inspect(parser, input('!>> ~~~figure $test-a\n>> > \n>>\n~~~\n> ~~~figure $test-a\n> > \n>\n[#a]\n~~~', new Context())), [['<blockquote><blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1" id="label:random:test-a"><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" id="label:random:test-a"><figcaption><span class="figindex">Test 1. </span><span class="figtext"><a class="index" href="#index:random:a">a</a></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
97
- assert.deepStrictEqual(inspect(parser, input('!>> ((a))\n> ((a))', new Context())), [['<blockquote><blockquote><section><p><sup class="annotation local" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote><section><p><sup class="annotation local" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
67
+ assert.deepStrictEqual(inspect(parser, input('!')), undefined);
68
+ assert.deepStrictEqual(inspect(parser, input('!>')), undefined);
69
+ assert.deepStrictEqual(inspect(parser, input('!> ')), [['<blockquote></blockquote>'], '']);
70
+ assert.deepStrictEqual(inspect(parser, input('!> \\')), [['<blockquote><section><p>\\</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
71
+ assert.deepStrictEqual(inspect(parser, input('!> \\\n')), [['<blockquote><section><p>\\</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
72
+ assert.deepStrictEqual(inspect(parser, input('!> a')), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
73
+ assert.deepStrictEqual(inspect(parser, input('!> a\n')), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
74
+ assert.deepStrictEqual(inspect(parser, input('!> a\\\nb')), [['<blockquote><section><p>a<br>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
75
+ assert.deepStrictEqual(inspect(parser, input('!> ++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, input('!> ++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, input('!> 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, input('!>> a')), [['<blockquote><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote></blockquote>'], '']);
79
+ assert.deepStrictEqual(inspect(parser, input('!>> 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, input('!> - a')), [['<blockquote><section><ul><li id="index:random:a" class="local">a</li></ul><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
81
+ assert.deepStrictEqual(inspect(parser, input('!> ```\na\n```')), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
82
+ assert.deepStrictEqual(inspect(parser, input('!> ```\n> a\n```')), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
83
+ assert.deepStrictEqual(inspect(parser, input('!> ```\n> a\n> ```')), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
84
+ assert.deepStrictEqual(inspect(parser, input('!> ```\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, input('!> 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, input('!> > a')), [['<blockquote><section><blockquote><pre>a</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
87
+ assert.deepStrictEqual(inspect(parser, input('!> > 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, input('!> > 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, input('!> > 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, input('!>> > 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, input('!> !> 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, input('!> \na')), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
93
+ assert.deepStrictEqual(inspect(parser, input('!>> ## a\n> ## a')), [['<blockquote><blockquote><section><h2 id="index:random:a" class="local">a</h2><h2>References</h2><ol class="references"></ol></section></blockquote><section><h2 id="index:random:a" class="local">a</h2><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
94
+ assert.deepStrictEqual(inspect(parser, input('!>> ~ a\n> ~ a')), [['<blockquote><blockquote><section><dl><dt id="index:random:a" class="local">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote><section><dl><dt id="index:random:a" class="local">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
95
+ assert.deepStrictEqual(inspect(parser, input('!>> ~~~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" id="label:random:test-a"><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" id="label:random:test-a"><figcaption><span class="figindex">Test 1. </span><span class="figtext"><a class="index" href="#index:random:a">a</a></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
96
+ assert.deepStrictEqual(inspect(parser, input('!>> ((a))\n> ((a))')), [['<blockquote><blockquote><section><p><sup class="annotation local" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote><section><p><sup class="annotation local" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
98
97
  });
99
98
 
100
99
  });
@@ -1,11 +1,11 @@
1
1
  import { BlockquoteParser } from '../block';
2
- import { Recursion } from '../context';
3
- import { List, Node } from '../../combinator/data/parser';
4
- import { union, some, spend, recursion, block, validate, rewrite, open, convert, lazy, fmap } from '../../combinator';
2
+ import { Input, Recursion } from '../context';
3
+ import { Parser, List, Node } from '../../combinator/parser';
4
+ import { union, some, always, force, recursion, scope, block, validate, rewrite, open, lazy, fmap } from '../../combinator';
5
+ import { document } from '../document';
5
6
  import { autolink } from '../autolink';
6
7
  import { contentline } from '../source';
7
- import { unwrap, randomID } from '../util';
8
- import { parse } from '../api/parse';
8
+ import { unwrap } from '../util';
9
9
  import { html, defrag } from 'typed-dom/dom';
10
10
 
11
11
  export const segment: BlockquoteParser.SegmentParser = block(union([
@@ -19,39 +19,46 @@ export const blockquote: BlockquoteParser = lazy(() => block(rewrite(segment, un
19
19
 
20
20
  const opener = /(?=>>+(?:$|[ \r\n]))/y;
21
21
  const indent = open(opener, some(contentline, />(?:$|[ \r\n])/y));
22
- const unindent = (source: string) => source.replace(/(?<=^|\n)>(?: |(?=>*(?:$|[ \r\n])))|\r?\n$/g, '');
22
+ const unindent = ({ source }: Input) => source.replace(/(?<=^|\n)>(?: |(?=>*(?:$|[ \r\n])))|\r?\n$/g, '');
23
23
 
24
24
  const source: BlockquoteParser.SourceParser = lazy(() => fmap(
25
- recursion(Recursion.blockquote, some(union([
25
+ recursion(Recursion.block, some(union([
26
26
  rewrite(
27
27
  indent,
28
- convert(unindent, source)),
28
+ scope(unindent, source, false)),
29
29
  rewrite(
30
30
  some(contentline, opener),
31
- convert(unindent, fmap(autolink, ns => new List([new Node(html('pre', defrag(unwrap(ns))))])))),
31
+ scope(unindent, force(fmap(autolink, ns => new List([new Node(html('pre', defrag(unwrap(ns))))]))), false)),
32
32
  ]))),
33
33
  ns => new List([new Node(html('blockquote', unwrap(ns)))])));
34
34
 
35
35
  const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
36
- recursion(Recursion.blockquote, some(union([
36
+ recursion(Recursion.block, some(union([
37
37
  rewrite(
38
38
  indent,
39
- convert(unindent, markdown)),
39
+ scope(unindent, markdown, false)),
40
40
  rewrite(
41
41
  some(contentline, opener),
42
- convert(unindent, context => {
43
- spend(context, 10);
44
- const { source } = context;
45
- const references = html('ol', { class: 'references' });
46
- const document = parse(source, {
47
- local: true,
48
- id: context.id === '' ? '' : randomID(),
49
- notes: {
50
- references,
51
- },
52
- }, context);
53
- context.position = source.length;
54
- return new List([new Node(html('section', [document, html('h2', 'References'), references]))]);
55
- })),
42
+ scope(unindent, always<Parser<HTMLElement | DocumentFragment, Input>>([
43
+ (input, output) => {
44
+ input.header = true;
45
+ input.local = true;
46
+ input.notes = {
47
+ references: html('ol', { class: 'references' }),
48
+ };
49
+ output.push();
50
+ return output.context;
51
+ },
52
+ document,
53
+ ({ notes }, output) => {
54
+ const doc = output.pop().head!.value;
55
+ if (!doc.firstChild) return output.context;
56
+ return output.append(new Node(html('section', [
57
+ doc,
58
+ html('h2', 'References'),
59
+ notes!.references,
60
+ ])));
61
+ },
62
+ ]), true)),
56
63
  ]))),
57
64
  ns => new List([new Node(html('blockquote', unwrap(ns)))])));
@@ -1,7 +1,6 @@
1
1
  import { codeblock } from './codeblock';
2
2
  import { some } from '../../combinator';
3
- import { input } from '../../combinator/data/parser';
4
- import { Context } from '../context';
3
+ import { input } from '../context';
5
4
  import { inspect } from '../../debug.test';
6
5
 
7
6
  describe('Unit: parser/block/codeblock', () => {
@@ -9,67 +8,67 @@ describe('Unit: parser/block/codeblock', () => {
9
8
  const parser = some(codeblock);
10
9
 
11
10
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
13
- assert.deepStrictEqual(inspect(parser, input('\n', new Context())), undefined);
14
- assert.deepStrictEqual(inspect(parser, input('```', new Context())), undefined);
15
- assert.deepStrictEqual(inspect(parser, input('```\n', new Context())), undefined);
16
- assert.deepStrictEqual(inspect(parser, input('```\na', new Context())), [['<pre class="invalid" translate="no">```\na</pre>'], '']);
17
- assert.deepStrictEqual(inspect(parser, input('```\na```', new Context())), [['<pre class="invalid" translate="no">```\na```</pre>'], '']);
18
- assert.deepStrictEqual(inspect(parser, input('```\na\n```b', new Context())), [['<pre class="invalid" translate="no">```\na\n```b</pre>'], '']);
19
- assert.deepStrictEqual(inspect(parser, input('```\na\n```\nb', new Context())), [['<pre class="invalid" translate="no">```\na\n```\nb</pre>'], '']);
20
- assert.deepStrictEqual(inspect(parser, input('```\n\n\n```', new Context())), undefined);
21
- assert.deepStrictEqual(inspect(parser, input('```a ```\n```', new Context())), undefined);
22
- assert.deepStrictEqual(inspect(parser, input('```\n```\n```', new Context())), [['<pre class="invalid" translate="no">```\n```\n```</pre>'], '']);
23
- assert.deepStrictEqual(inspect(parser, input('```\n````', new Context())), [['<pre class="invalid" translate="no">```\n````</pre>'], '']);
24
- assert.deepStrictEqual(inspect(parser, input('````\n```', new Context())), [['<pre class="invalid" translate="no">````\n```</pre>'], '']);
25
- assert.deepStrictEqual(inspect(parser, input(' ```\n```', new Context())), undefined);
26
- assert.deepStrictEqual(inspect(parser, input(`\`\`\`\n0${'\n'.repeat(301)}\`\`\``, new Context()), '>'), [['<pre class="invalid" translate="no">'], '']);
11
+ assert.deepStrictEqual(inspect(parser, input('')), undefined);
12
+ assert.deepStrictEqual(inspect(parser, input('\n')), undefined);
13
+ assert.deepStrictEqual(inspect(parser, input('```')), undefined);
14
+ assert.deepStrictEqual(inspect(parser, input('```\n')), undefined);
15
+ assert.deepStrictEqual(inspect(parser, input('```\na')), [['<pre class="invalid" translate="no">```\na</pre>'], '']);
16
+ assert.deepStrictEqual(inspect(parser, input('```\na```')), [['<pre class="invalid" translate="no">```\na```</pre>'], '']);
17
+ assert.deepStrictEqual(inspect(parser, input('```\na\n```b')), [['<pre class="invalid" translate="no">```\na\n```b</pre>'], '']);
18
+ assert.deepStrictEqual(inspect(parser, input('```\na\n```\nb')), [['<pre class="invalid" translate="no">```\na\n```\nb</pre>'], '']);
19
+ assert.deepStrictEqual(inspect(parser, input('```\n\n\n```')), undefined);
20
+ assert.deepStrictEqual(inspect(parser, input('```a ```\n```')), undefined);
21
+ assert.deepStrictEqual(inspect(parser, input('```\n```\n```')), [['<pre class="invalid" translate="no">```\n```\n```</pre>'], '']);
22
+ assert.deepStrictEqual(inspect(parser, input('```\n````')), [['<pre class="invalid" translate="no">```\n````</pre>'], '']);
23
+ assert.deepStrictEqual(inspect(parser, input('````\n```')), [['<pre class="invalid" translate="no">````\n```</pre>'], '']);
24
+ assert.deepStrictEqual(inspect(parser, input(' ```\n```')), undefined);
25
+ assert.deepStrictEqual(inspect(parser, input(`\`\`\`\n0${'\n'.repeat(301)}\`\`\``), '>'), [['<pre class="invalid" translate="no">'], '']);
27
26
  });
28
27
 
29
28
  it('basic', () => {
30
- assert.deepStrictEqual(inspect(parser, input('```\n```', new Context())), [['<pre class="text"></pre>'], '']);
31
- assert.deepStrictEqual(inspect(parser, input('```\n\n```', new Context())), [['<pre class="text"></pre>'], '']);
32
- assert.deepStrictEqual(inspect(parser, input('```\na\n```', new Context())), [['<pre class="text">a</pre>'], '']);
33
- assert.deepStrictEqual(inspect(parser, input('```\na\nb\n```', new Context())), [['<pre class="text">a<br>b</pre>'], '']);
34
- assert.deepStrictEqual(inspect(parser, input('```\n\\\n```', new Context())), [['<pre class="text">\\</pre>'], '']);
35
- assert.deepStrictEqual(inspect(parser, input('```\n`\n```', new Context())), [['<pre class="text">`</pre>'], '']);
36
- assert.deepStrictEqual(inspect(parser, input('```\n```\n\n```', new Context())), [['<pre class="text"></pre>'], '\n```']);
37
- assert.deepStrictEqual(inspect(parser, input('```\n````\n```', new Context())), [['<pre class="text">````</pre>'], '']);
38
- assert.deepStrictEqual(inspect(parser, input('```\n````\n\n```', new Context())), [['<pre class="text">````<br></pre>'], '']);
39
- assert.deepStrictEqual(inspect(parser, input('````\n```\n````', new Context())), [['<pre class="text">```</pre>'], '']);
40
- assert.deepStrictEqual(inspect(parser, input('````\n```\n\n````', new Context())), [['<pre class="text">```<br></pre>'], '']);
41
- assert.deepStrictEqual(inspect(parser, input('```\n\n```\n', new Context())), [['<pre class="text"></pre>'], '']);
42
- assert.deepStrictEqual(inspect(parser, input('```\nhttp://host\n```', new Context())), [['<pre class="text"><a class="url" href="http://host" target="_blank">http://host</a></pre>'], '']);
43
- assert.deepStrictEqual(inspect(parser, input('```\nhttp://host)\n```', new Context())), [['<pre class="text"><a class="url" href="http://host)" target="_blank">http://host)</a></pre>'], '']);
44
- assert.deepStrictEqual(inspect(parser, input('```\n!http://host\n```', new Context())), [['<pre class="text">!<a class="url" href="http://host" target="_blank">http://host</a></pre>'], '']);
45
- assert.deepStrictEqual(inspect(parser, input('```\n!http://host)\n```', new Context())), [['<pre class="text">!<a class="url" href="http://host)" target="_blank">http://host)</a></pre>'], '']);
46
- assert.deepStrictEqual(inspect(parser, input('```\n#a\n```', new Context())), [['<pre class="text"><a class="hashtag" href="/hashtags/a">#a</a></pre>'], '']);
47
- assert.deepStrictEqual(inspect(parser, input('```\n@a#b\n```', new Context())), [['<pre class="text"><a class="channel" href="/@a?ch=b">@a#b</a></pre>'], '']);
48
- assert.deepStrictEqual(inspect(parser, input(`\`\`\`\n0${'\n'.repeat(300)}\`\`\``, new Context()), '>'), [['<pre class="text">'], '']);
29
+ assert.deepStrictEqual(inspect(parser, input('```\n```')), [['<pre class="text"></pre>'], '']);
30
+ assert.deepStrictEqual(inspect(parser, input('```\n\n```')), [['<pre class="text"></pre>'], '']);
31
+ assert.deepStrictEqual(inspect(parser, input('```\na\n```')), [['<pre class="text">a</pre>'], '']);
32
+ assert.deepStrictEqual(inspect(parser, input('```\na\nb\n```')), [['<pre class="text">a<br>b</pre>'], '']);
33
+ assert.deepStrictEqual(inspect(parser, input('```\n\\\n```')), [['<pre class="text">\\</pre>'], '']);
34
+ assert.deepStrictEqual(inspect(parser, input('```\n`\n```')), [['<pre class="text">`</pre>'], '']);
35
+ assert.deepStrictEqual(inspect(parser, input('```\n```\n\n```')), [['<pre class="text"></pre>'], '\n```']);
36
+ assert.deepStrictEqual(inspect(parser, input('```\n````\n```')), [['<pre class="text">````</pre>'], '']);
37
+ assert.deepStrictEqual(inspect(parser, input('```\n````\n\n```')), [['<pre class="text">````<br></pre>'], '']);
38
+ assert.deepStrictEqual(inspect(parser, input('````\n```\n````')), [['<pre class="text">```</pre>'], '']);
39
+ assert.deepStrictEqual(inspect(parser, input('````\n```\n\n````')), [['<pre class="text">```<br></pre>'], '']);
40
+ assert.deepStrictEqual(inspect(parser, input('```\n\n```\n')), [['<pre class="text"></pre>'], '']);
41
+ assert.deepStrictEqual(inspect(parser, input('```\nhttp://host\n```')), [['<pre class="text"><a class="url" href="http://host" target="_blank">http://host</a></pre>'], '']);
42
+ assert.deepStrictEqual(inspect(parser, input('```\nhttp://host)\n```')), [['<pre class="text"><a class="url" href="http://host)" target="_blank">http://host)</a></pre>'], '']);
43
+ assert.deepStrictEqual(inspect(parser, input('```\n!http://host\n```')), [['<pre class="text">!<a class="url" href="http://host" target="_blank">http://host</a></pre>'], '']);
44
+ assert.deepStrictEqual(inspect(parser, input('```\n!http://host)\n```')), [['<pre class="text">!<a class="url" href="http://host)" target="_blank">http://host)</a></pre>'], '']);
45
+ assert.deepStrictEqual(inspect(parser, input('```\n#a\n```')), [['<pre class="text"><a class="hashtag" href="/hashtags/a">#a</a></pre>'], '']);
46
+ assert.deepStrictEqual(inspect(parser, input('```\n@a#b\n```')), [['<pre class="text"><a class="channel" href="/@a?ch=b">@a#b</a></pre>'], '']);
47
+ assert.deepStrictEqual(inspect(parser, input(`\`\`\`\n0${'\n'.repeat(300)}\`\`\``), '>'), [['<pre class="text">'], '']);
49
48
  });
50
49
 
51
50
  it('attribute', () => {
52
- assert.deepStrictEqual(inspect(parser, input('```0\n```', new Context())), [['<pre class="code language-0" translate="no" data-lang="0"></pre>'], '']);
53
- assert.deepStrictEqual(inspect(parser, input('```a\n```', new Context())), [['<pre class="code language-a" translate="no" data-lang="a"></pre>'], '']);
54
- assert.deepStrictEqual(inspect(parser, input('```A\n```', new Context())), [['<pre class="code language-a" translate="no" data-lang="a"></pre>'], '']);
55
- assert.deepStrictEqual(inspect(parser, input('```a-b\n```', new Context())), [['<pre class="code language-a-b" translate="no" data-lang="a-b"></pre>'], '']);
56
- assert.deepStrictEqual(inspect(parser, input('```a-b0\n```', new Context())), [['<pre class="code language-a-b0" translate="no" data-lang="a-b0"></pre>'], '']);
57
- assert.deepStrictEqual(inspect(parser, input('```a--b\n```', new Context())), [['<pre class="text" data-path="a--b"></pre>'], '']);
58
- assert.deepStrictEqual(inspect(parser, input('``` b\n```', new Context())), [['<pre class="text" data-path="b"></pre>'], '']);
59
- assert.deepStrictEqual(inspect(parser, input('``` b c\n```', new Context())), [['<pre class="invalid" translate="no">``` b c\n```</pre>'], '']);
60
- assert.deepStrictEqual(inspect(parser, input('``` b\\ c\n```', new Context())), [['<pre class="text" data-path="b\\ c"></pre>'], '']);
61
- assert.deepStrictEqual(inspect(parser, input('``` b.c\n```', new Context())), [['<pre class="code language-c" translate="no" data-lang="c" data-path="b.c"></pre>'], '']);
62
- assert.deepStrictEqual(inspect(parser, input('``` .b\n```', new Context())), [['<pre class="text" data-path=".b"></pre>'], '']);
63
- assert.deepStrictEqual(inspect(parser, input('``` b \n```', new Context())), [['<pre class="text" data-path="b"></pre>'], '']);
64
- assert.deepStrictEqual(inspect(parser, input('``` ~/.b\n```', new Context())), [['<pre class="text" data-path="~/.b"></pre>'], '']);
65
- assert.deepStrictEqual(inspect(parser, input('``` ~/b.c\n```', new Context())), [['<pre class="code language-c" translate="no" data-lang="c" data-path="~/b.c"></pre>'], '']);
66
- assert.deepStrictEqual(inspect(parser, input('```.b\n```', new Context())), [['<pre class="text" data-path=".b"></pre>'], '']);
67
- assert.deepStrictEqual(inspect(parser, input('```b.c\n```', new Context())), [['<pre class="code language-c" translate="no" data-lang="c" data-path="b.c"></pre>'], '']);
68
- assert.deepStrictEqual(inspect(parser, input('```a b.c\n```', new Context())), [['<pre class="code language-a" translate="no" data-lang="a" data-path="b.c"></pre>'], '']);
69
- assert.deepStrictEqual(inspect(parser, input('```a 1\n```', new Context())), [['<pre class="code language-a" translate="no" data-lang="a" data-line="1"></pre>'], '']);
70
- assert.deepStrictEqual(inspect(parser, input('``` 1\n```', new Context())), [['<pre class="text" data-line="1"></pre>'], '']);
71
- assert.deepStrictEqual(inspect(parser, input('``` 1,2-3\n```', new Context())), [['<pre class="text" data-line="1,2-3"></pre>'], '']);
72
- assert.deepStrictEqual(inspect(parser, input('``` 1 b.c\n```', new Context())), [['<pre class="code language-c" translate="no" data-lang="c" data-line="1" data-path="b.c"></pre>'], '']);
51
+ assert.deepStrictEqual(inspect(parser, input('```0\n```')), [['<pre class="code language-0" translate="no" data-lang="0"></pre>'], '']);
52
+ assert.deepStrictEqual(inspect(parser, input('```a\n```')), [['<pre class="code language-a" translate="no" data-lang="a"></pre>'], '']);
53
+ assert.deepStrictEqual(inspect(parser, input('```A\n```')), [['<pre class="code language-a" translate="no" data-lang="a"></pre>'], '']);
54
+ assert.deepStrictEqual(inspect(parser, input('```a-b\n```')), [['<pre class="code language-a-b" translate="no" data-lang="a-b"></pre>'], '']);
55
+ assert.deepStrictEqual(inspect(parser, input('```a-b0\n```')), [['<pre class="code language-a-b0" translate="no" data-lang="a-b0"></pre>'], '']);
56
+ assert.deepStrictEqual(inspect(parser, input('```a--b\n```')), [['<pre class="text" data-path="a--b"></pre>'], '']);
57
+ assert.deepStrictEqual(inspect(parser, input('``` b\n```')), [['<pre class="text" data-path="b"></pre>'], '']);
58
+ assert.deepStrictEqual(inspect(parser, input('``` b c\n```')), [['<pre class="invalid" translate="no">``` b c\n```</pre>'], '']);
59
+ assert.deepStrictEqual(inspect(parser, input('``` b\\ c\n```')), [['<pre class="text" data-path="b\\ c"></pre>'], '']);
60
+ assert.deepStrictEqual(inspect(parser, input('``` b.c\n```')), [['<pre class="code language-c" translate="no" data-lang="c" data-path="b.c"></pre>'], '']);
61
+ assert.deepStrictEqual(inspect(parser, input('``` .b\n```')), [['<pre class="text" data-path=".b"></pre>'], '']);
62
+ assert.deepStrictEqual(inspect(parser, input('``` b \n```')), [['<pre class="text" data-path="b"></pre>'], '']);
63
+ assert.deepStrictEqual(inspect(parser, input('``` ~/.b\n```')), [['<pre class="text" data-path="~/.b"></pre>'], '']);
64
+ assert.deepStrictEqual(inspect(parser, input('``` ~/b.c\n```')), [['<pre class="code language-c" translate="no" data-lang="c" data-path="~/b.c"></pre>'], '']);
65
+ assert.deepStrictEqual(inspect(parser, input('```.b\n```')), [['<pre class="text" data-path=".b"></pre>'], '']);
66
+ assert.deepStrictEqual(inspect(parser, input('```b.c\n```')), [['<pre class="code language-c" translate="no" data-lang="c" data-path="b.c"></pre>'], '']);
67
+ assert.deepStrictEqual(inspect(parser, input('```a b.c\n```')), [['<pre class="code language-a" translate="no" data-lang="a" data-path="b.c"></pre>'], '']);
68
+ assert.deepStrictEqual(inspect(parser, input('```a 1\n```')), [['<pre class="code language-a" translate="no" data-lang="a" data-line="1"></pre>'], '']);
69
+ assert.deepStrictEqual(inspect(parser, input('``` 1\n```')), [['<pre class="text" data-line="1"></pre>'], '']);
70
+ assert.deepStrictEqual(inspect(parser, input('``` 1,2-3\n```')), [['<pre class="text" data-line="1,2-3"></pre>'], '']);
71
+ assert.deepStrictEqual(inspect(parser, input('``` 1 b.c\n```')), [['<pre class="code language-c" translate="no" data-lang="c" data-line="1" data-path="b.c"></pre>'], '']);
73
72
  });
74
73
 
75
74
  });
@@ -1,6 +1,6 @@
1
1
  import { CodeBlockParser } from '../block';
2
- import { List, Node, subinput } from '../../combinator/data/parser';
3
- import { block, fence, clear, fmap } from '../../combinator';
2
+ import { Node } from '../../combinator/parser';
3
+ import { inits, force, block, fence } from '../../combinator';
4
4
  import { autolink } from '../autolink';
5
5
  import { unwrap, invalid } from '../util';
6
6
  import { html, defrag } from 'typed-dom/dom';
@@ -9,16 +9,15 @@ const opener = /(`{3,})(?!`)([^\r\n]*)(?:$|\r?\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(
12
- clear(fence(opener, 300)));
12
+ fence(opener, false, 300));
13
13
 
14
14
  export const segment_: CodeBlockParser.SegmentParser = block(
15
- clear(fence(opener, 300, false)), false);
15
+ fence(opener, false, 300, false), false);
16
16
 
17
- export const codeblock: CodeBlockParser = block(fmap(
18
- fence(opener, 300),
19
- // Bug: Type mismatch between outer and inner.
20
- (nodes, context) => {
21
- const [body, overflow, closer, opener, delim, param] = unwrap<string>(nodes);
17
+ export const codeblock: CodeBlockParser = block(inits([
18
+ fence(opener, true, 300),
19
+ (input, output) => {
20
+ const [body, overflow, closer, opener, delim, param] = unwrap(output.pop()) as string[];
22
21
  const params = param.match(/(?:\\.?|\S)+/g)?.reduce<{
23
22
  lang?: string;
24
23
  path?: string;
@@ -50,18 +49,25 @@ export const codeblock: CodeBlockParser = block(fmap(
50
49
  : params[name] = value;
51
50
  return params;
52
51
  }, {}) ?? {};
53
- if (!closer || overflow || params.invalid) return new List([new Node(html('pre', {
54
- class: 'invalid',
55
- translate: 'no',
56
- ...invalid(
57
- 'codeblock',
58
- !closer || overflow ? 'fence' : 'argument',
59
- !closer
60
- ? `Missing the closing delimiter "${delim}"`
61
- : overflow
62
- ? `Invalid trailing line after the closing delimiter "${delim}"`
63
- : params.invalid!),
64
- }, `${opener}${body}${overflow || closer}`))]);
52
+ if (!closer || overflow || params.invalid) {
53
+ output.append(
54
+ new Node(html('pre',
55
+ {
56
+ class: 'invalid',
57
+ translate: 'no',
58
+ ...invalid(
59
+ 'codeblock',
60
+ !closer || overflow ? 'fence' : 'argument',
61
+ !closer
62
+ ? `Missing the closing delimiter "${delim}"`
63
+ : overflow
64
+ ? `Invalid trailing line after the closing delimiter "${delim}"`
65
+ : params.invalid!),
66
+ },
67
+ `${opener}${body}${overflow || closer}`)));
68
+ return;
69
+ }
70
+ const src = body.slice(0, body.at(-2) === '\r' ? -2 : -1);
65
71
  const el = html('pre',
66
72
  {
67
73
  class: params.lang ? `code language-${params.lang}` : 'text',
@@ -71,8 +77,20 @@ export const codeblock: CodeBlockParser = block(fmap(
71
77
  'data-path': params.path || undefined,
72
78
  },
73
79
  params.lang
74
- ? context.caches?.code?.get(`${params.lang ?? ''}\n${body.slice(0, -1)}`)?.cloneNode(true).childNodes ||
75
- body.slice(0, -1) || undefined
76
- : defrag(unwrap(autolink(subinput(body.slice(0, -1), context)))));
77
- return new List([new Node(el)]);
78
- }));
80
+ ? input.caches?.code?.get(`${params.lang ?? ''}\n${src}`)?.cloneNode(true).childNodes ||
81
+ src || undefined
82
+ : undefined);
83
+ output.append(new Node(el));
84
+ if (params.lang) return;
85
+ input.scope.focus(src);
86
+ output.push();
87
+ return output.context;
88
+ },
89
+ force(autolink),
90
+ (input, output) => {
91
+ input.scope.unfocus();
92
+ const content = output.pop();
93
+ output.peek().last!.value.replaceChildren(...defrag(unwrap(content)));
94
+ return output.context;
95
+ },
96
+ ]));