securemark 0.295.0 → 0.295.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (169) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/design.md +4 -3
  3. package/dist/index.js +529 -484
  4. package/markdown.d.ts +13 -28
  5. package/package.json +1 -1
  6. package/src/combinator/control/constraint/block.test.ts +6 -8
  7. package/src/combinator/control/constraint/contract.ts +7 -7
  8. package/src/combinator/control/constraint/line.test.ts +7 -9
  9. package/src/combinator/control/constraint/line.ts +0 -1
  10. package/src/combinator/control/manipulation/clear.ts +2 -2
  11. package/src/combinator/control/manipulation/convert.ts +3 -3
  12. package/src/combinator/control/manipulation/duplicate.ts +4 -4
  13. package/src/combinator/control/manipulation/fallback.ts +2 -2
  14. package/src/combinator/control/manipulation/fence.ts +3 -3
  15. package/src/combinator/control/manipulation/indent.test.ts +20 -22
  16. package/src/combinator/control/manipulation/indent.ts +2 -2
  17. package/src/combinator/control/manipulation/recovery.ts +3 -3
  18. package/src/combinator/control/manipulation/reverse.ts +2 -2
  19. package/src/combinator/control/manipulation/scope.ts +2 -4
  20. package/src/combinator/control/manipulation/surround.ts +66 -66
  21. package/src/combinator/control/monad/bind.ts +6 -6
  22. package/src/combinator/control/monad/fmap.ts +6 -6
  23. package/src/combinator/data/data.ts +2 -2
  24. package/src/combinator/data/{parser/context/delimiter.ts → delimiter.ts} +4 -4
  25. package/src/combinator/data/parser/context.test.ts +12 -11
  26. package/src/combinator/data/parser/context.ts +13 -14
  27. package/src/combinator/data/parser/inits.ts +5 -5
  28. package/src/combinator/data/parser/sequence.test.ts +12 -13
  29. package/src/combinator/data/parser/sequence.ts +5 -5
  30. package/src/combinator/data/parser/some.test.ts +15 -16
  31. package/src/combinator/data/parser/some.ts +5 -6
  32. package/src/combinator/data/parser/subsequence.test.ts +16 -17
  33. package/src/combinator/data/parser/subsequence.ts +3 -3
  34. package/src/combinator/data/parser/tails.ts +3 -3
  35. package/src/combinator/data/parser/union.test.ts +12 -13
  36. package/src/combinator/data/parser/union.ts +3 -3
  37. package/src/combinator/data/parser.ts +55 -32
  38. package/src/debug.test.ts +5 -3
  39. package/src/parser/api/bind.ts +8 -6
  40. package/src/parser/api/header.ts +4 -4
  41. package/src/parser/api/normalize.ts +2 -1
  42. package/src/parser/api/parse.test.ts +7 -6
  43. package/src/parser/api/parse.ts +9 -8
  44. package/src/parser/autolink.test.ts +18 -18
  45. package/src/parser/block/blockquote.test.ts +79 -79
  46. package/src/parser/block/blockquote.ts +5 -5
  47. package/src/parser/block/codeblock.test.ts +57 -57
  48. package/src/parser/block/codeblock.ts +3 -3
  49. package/src/parser/block/dlist.test.ts +57 -57
  50. package/src/parser/block/dlist.ts +6 -6
  51. package/src/parser/block/extension/aside.test.ts +9 -9
  52. package/src/parser/block/extension/aside.ts +5 -5
  53. package/src/parser/block/extension/example.test.ts +19 -19
  54. package/src/parser/block/extension/example.ts +6 -6
  55. package/src/parser/block/extension/fig.test.ts +36 -36
  56. package/src/parser/block/extension/figbase.test.ts +16 -16
  57. package/src/parser/block/extension/figbase.ts +2 -2
  58. package/src/parser/block/extension/figure.test.ts +63 -63
  59. package/src/parser/block/extension/figure.ts +3 -3
  60. package/src/parser/block/extension/message.test.ts +14 -14
  61. package/src/parser/block/extension/message.ts +5 -5
  62. package/src/parser/block/extension/placeholder.test.ts +13 -13
  63. package/src/parser/block/extension/placeholder.ts +2 -2
  64. package/src/parser/block/extension/table.test.ts +76 -76
  65. package/src/parser/block/extension/table.ts +14 -14
  66. package/src/parser/block/extension.test.ts +24 -24
  67. package/src/parser/block/heading.test.ts +59 -59
  68. package/src/parser/block/heading.ts +7 -7
  69. package/src/parser/block/ilist.test.ts +8 -12
  70. package/src/parser/block/ilist.ts +6 -6
  71. package/src/parser/block/mathblock.test.ts +32 -32
  72. package/src/parser/block/mathblock.ts +3 -3
  73. package/src/parser/block/mediablock.ts +3 -3
  74. package/src/parser/block/olist.test.ts +103 -103
  75. package/src/parser/block/olist.ts +5 -5
  76. package/src/parser/block/pagebreak.test.ts +16 -16
  77. package/src/parser/block/pagebreak.ts +2 -2
  78. package/src/parser/block/paragraph.test.ts +58 -58
  79. package/src/parser/block/paragraph.ts +2 -2
  80. package/src/parser/block/reply/cite.test.ts +40 -40
  81. package/src/parser/block/reply/cite.ts +6 -6
  82. package/src/parser/block/reply/quote.test.ts +51 -51
  83. package/src/parser/block/reply/quote.ts +3 -3
  84. package/src/parser/block/reply.test.ts +20 -20
  85. package/src/parser/block/reply.ts +3 -3
  86. package/src/parser/block/sidefence.test.ts +48 -48
  87. package/src/parser/block/sidefence.ts +4 -4
  88. package/src/parser/block/table.test.ts +50 -50
  89. package/src/parser/block/table.ts +12 -12
  90. package/src/parser/block/ulist.test.ts +53 -53
  91. package/src/parser/block/ulist.ts +6 -6
  92. package/src/parser/block.ts +6 -4
  93. package/src/parser/context.ts +39 -0
  94. package/src/parser/header.test.ts +23 -23
  95. package/src/parser/header.ts +5 -5
  96. package/src/parser/inline/annotation.test.ts +43 -43
  97. package/src/parser/inline/annotation.ts +15 -5
  98. package/src/parser/inline/autolink/account.test.ts +33 -33
  99. package/src/parser/inline/autolink/account.ts +9 -9
  100. package/src/parser/inline/autolink/anchor.test.ts +22 -22
  101. package/src/parser/inline/autolink/anchor.ts +4 -4
  102. package/src/parser/inline/autolink/channel.test.ts +15 -15
  103. package/src/parser/inline/autolink/email.test.ts +37 -37
  104. package/src/parser/inline/autolink/email.ts +2 -2
  105. package/src/parser/inline/autolink/hashnum.test.ts +33 -33
  106. package/src/parser/inline/autolink/hashnum.ts +6 -5
  107. package/src/parser/inline/autolink/hashtag.test.ts +60 -60
  108. package/src/parser/inline/autolink/hashtag.ts +4 -4
  109. package/src/parser/inline/autolink/url.test.ts +75 -75
  110. package/src/parser/inline/autolink/url.ts +4 -4
  111. package/src/parser/inline/bracket.test.ts +70 -70
  112. package/src/parser/inline/bracket.ts +35 -32
  113. package/src/parser/inline/code.test.ts +31 -31
  114. package/src/parser/inline/code.ts +4 -4
  115. package/src/parser/inline/deletion.test.ts +28 -28
  116. package/src/parser/inline/deletion.ts +4 -4
  117. package/src/parser/inline/emphasis.test.ts +40 -40
  118. package/src/parser/inline/emphasis.ts +3 -3
  119. package/src/parser/inline/emstrong.test.ts +101 -101
  120. package/src/parser/inline/emstrong.ts +23 -23
  121. package/src/parser/inline/extension/index.test.ts +92 -92
  122. package/src/parser/inline/extension/index.ts +5 -5
  123. package/src/parser/inline/extension/indexee.ts +5 -5
  124. package/src/parser/inline/extension/indexer.test.ts +24 -24
  125. package/src/parser/inline/extension/indexer.ts +2 -2
  126. package/src/parser/inline/extension/label.test.ts +33 -33
  127. package/src/parser/inline/extension/label.ts +2 -2
  128. package/src/parser/inline/extension/placeholder.test.ts +43 -43
  129. package/src/parser/inline/extension/placeholder.ts +4 -4
  130. package/src/parser/inline/html.test.ts +108 -108
  131. package/src/parser/inline/html.ts +10 -10
  132. package/src/parser/inline/htmlentity.test.ts +38 -38
  133. package/src/parser/inline/htmlentity.ts +5 -5
  134. package/src/parser/inline/insertion.test.ts +28 -28
  135. package/src/parser/inline/insertion.ts +4 -4
  136. package/src/parser/inline/italic.test.ts +55 -55
  137. package/src/parser/inline/italic.ts +4 -4
  138. package/src/parser/inline/link.test.ts +186 -187
  139. package/src/parser/inline/link.ts +16 -17
  140. package/src/parser/inline/mark.test.ts +31 -31
  141. package/src/parser/inline/mark.ts +5 -5
  142. package/src/parser/inline/math.test.ts +132 -132
  143. package/src/parser/inline/math.ts +2 -2
  144. package/src/parser/inline/media.test.ts +91 -91
  145. package/src/parser/inline/media.ts +15 -15
  146. package/src/parser/inline/reference.test.ts +109 -109
  147. package/src/parser/inline/reference.ts +16 -55
  148. package/src/parser/inline/remark.test.ts +50 -50
  149. package/src/parser/inline/remark.ts +5 -5
  150. package/src/parser/inline/ruby.test.ts +45 -45
  151. package/src/parser/inline/ruby.ts +17 -17
  152. package/src/parser/inline/shortmedia.test.ts +10 -10
  153. package/src/parser/inline/strong.test.ts +37 -37
  154. package/src/parser/inline/strong.ts +3 -3
  155. package/src/parser/inline/template.test.ts +23 -23
  156. package/src/parser/inline/template.ts +5 -5
  157. package/src/parser/inline.test.ts +224 -223
  158. package/src/parser/segment.ts +2 -2
  159. package/src/parser/source/escapable.test.ts +24 -24
  160. package/src/parser/source/escapable.ts +8 -8
  161. package/src/parser/source/line.test.ts +18 -18
  162. package/src/parser/source/str.ts +2 -2
  163. package/src/parser/source/text.test.ts +85 -85
  164. package/src/parser/source/text.ts +5 -5
  165. package/src/parser/source/unescapable.test.ts +24 -24
  166. package/src/parser/source/unescapable.ts +5 -5
  167. package/src/parser/util.ts +10 -11
  168. package/src/parser/visibility.ts +8 -9
  169. package/src/util/quote.ts +2 -1
@@ -1,55 +1,55 @@
1
1
  import { cite } from './cite';
2
2
  import { some } from '../../../combinator';
3
3
  import { input } from '../../../combinator/data/parser';
4
+ import { Context } from '../../context';
4
5
  import { inspect } from '../../../debug.test';
5
6
 
6
7
  describe('Unit: parser/block/reply/cite', () => {
7
8
  describe('cite', () => {
8
- const parser = (source: string) => some(cite)(input(source, ctx));
9
- const { context: ctx } = input('', {});
9
+ const parser = some(cite);
10
10
 
11
11
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
- assert.deepStrictEqual(inspect(parser('>'), ctx), undefined);
14
- assert.deepStrictEqual(inspect(parser('>0'), ctx), undefined);
15
- assert.deepStrictEqual(inspect(parser('>\n'), ctx), undefined);
16
- assert.deepStrictEqual(inspect(parser('>>'), ctx), undefined);
17
- assert.deepStrictEqual(inspect(parser('>> '), ctx), undefined);
18
- assert.deepStrictEqual(inspect(parser('>>0 a'), ctx), undefined);
19
- assert.deepStrictEqual(inspect(parser('>>/'), ctx), [['<span class="cite invalid">&gt;&gt;/</span>', '<br>'], '']);
20
- assert.deepStrictEqual(inspect(parser('>>\\'), ctx), [['<span class="cite invalid">&gt;&gt;\\</span>', '<br>'], '']);
21
- assert.deepStrictEqual(inspect(parser('>>01#'), ctx), [['<span class="cite invalid">&gt;&gt;01#</span>', '<br>'], '']);
22
- assert.deepStrictEqual(inspect(parser('>>01@'), ctx), [['<span class="cite invalid">&gt;&gt;01@</span>', '<br>'], '']);
23
- assert.deepStrictEqual(inspect(parser('>>http://'), ctx), [['<span class="cite invalid">&gt;&gt;http://</span>', '<br>'], '']);
24
- assert.deepStrictEqual(inspect(parser('>>tel:1234567890'), ctx), [['<span class="cite invalid">&gt;&gt;tel:1234567890</span>', '<br>'], '']);
25
- assert.deepStrictEqual(inspect(parser('>> 0'), ctx), undefined);
26
- assert.deepStrictEqual(inspect(parser(' >>0'), ctx), undefined);
27
- assert.deepStrictEqual(inspect(parser('\\>>0'), ctx), undefined);
12
+ assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
13
+ assert.deepStrictEqual(inspect(parser, input('>', new Context())), undefined);
14
+ assert.deepStrictEqual(inspect(parser, input('>0', new Context())), undefined);
15
+ assert.deepStrictEqual(inspect(parser, input('>\n', new Context())), undefined);
16
+ assert.deepStrictEqual(inspect(parser, input('>>', new Context())), undefined);
17
+ assert.deepStrictEqual(inspect(parser, input('>> ', new Context())), undefined);
18
+ assert.deepStrictEqual(inspect(parser, input('>>0 a', new Context())), undefined);
19
+ assert.deepStrictEqual(inspect(parser, input('>>/', new Context())), [['<span class="cite invalid">&gt;&gt;/</span>', '<br>'], '']);
20
+ assert.deepStrictEqual(inspect(parser, input('>>\\', new Context())), [['<span class="cite invalid">&gt;&gt;\\</span>', '<br>'], '']);
21
+ assert.deepStrictEqual(inspect(parser, input('>>01#', new Context())), [['<span class="cite invalid">&gt;&gt;01#</span>', '<br>'], '']);
22
+ assert.deepStrictEqual(inspect(parser, input('>>01@', new Context())), [['<span class="cite invalid">&gt;&gt;01@</span>', '<br>'], '']);
23
+ assert.deepStrictEqual(inspect(parser, input('>>http://', new Context())), [['<span class="cite invalid">&gt;&gt;http://</span>', '<br>'], '']);
24
+ assert.deepStrictEqual(inspect(parser, input('>>tel:1234567890', new Context())), [['<span class="cite invalid">&gt;&gt;tel:1234567890</span>', '<br>'], '']);
25
+ assert.deepStrictEqual(inspect(parser, input('>> 0', new Context())), undefined);
26
+ assert.deepStrictEqual(inspect(parser, input(' >>0', new Context())), undefined);
27
+ assert.deepStrictEqual(inspect(parser, input('\\>>0', new Context())), undefined);
28
28
  });
29
29
 
30
30
  it('valid', () => {
31
- assert.deepStrictEqual(inspect(parser('>>0'), ctx), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '']);
32
- assert.deepStrictEqual(inspect(parser('>>0 '), ctx), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '']);
33
- assert.deepStrictEqual(inspect(parser('>>0\n'), ctx), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '']);
34
- assert.deepStrictEqual(inspect(parser('>>>0'), ctx), [['<span class="cite">&gt;&gt;<a class="anchor" href="?at=0" data-depth="2">&gt;0</a></span>', '<br>'], '']);
35
- assert.deepStrictEqual(inspect(parser('>>0\n1'), ctx), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '1']);
36
- assert.deepStrictEqual(inspect(parser('>>0\n>1'), ctx), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '>1']);
37
- assert.deepStrictEqual(inspect(parser('>>0\n>>'), ctx), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '>>']);
38
- assert.deepStrictEqual(inspect(parser('>>0\n>>1'), ctx), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>', '<span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span>', '<br>'], '']);
39
- assert.deepStrictEqual(inspect(parser('>>0\n>>>1'), ctx), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>', '<span class="cite">&gt;&gt;<a class="anchor" href="?at=1" data-depth="2">&gt;1</a></span>', '<br>'], '']);
40
- assert.deepStrictEqual(inspect(parser('>>>0\n>>'), ctx), [['<span class="cite">&gt;&gt;<a class="anchor" href="?at=0" data-depth="2">&gt;0</a></span>', '<br>'], '>>']);
41
- assert.deepStrictEqual(inspect(parser('>>>0\n>>1'), ctx), [['<span class="cite">&gt;&gt;<a class="anchor" href="?at=0" data-depth="2">&gt;0</a></span>', '<br>', '<span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span>', '<br>'], '']);
42
- assert.deepStrictEqual(inspect(parser('>>#'), ctx), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#</a></span>', '<br>'], '']);
43
- assert.deepStrictEqual(inspect(parser('>># '), ctx), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#</a></span>', '<br>'], '']);
44
- assert.deepStrictEqual(inspect(parser('>>#\n'), ctx), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#</a></span>', '<br>'], '']);
45
- assert.deepStrictEqual(inspect(parser('>>#a'), ctx), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#a</a></span>', '<br>'], '']);
46
- assert.deepStrictEqual(inspect(parser('>>#index::a'), ctx), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#index::a</a></span>', '<br>'], '']);
47
- assert.deepStrictEqual(inspect(parser('>>#:~:text=a'), ctx), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#:~:text=a</a></span>', '<br>'], '']);
48
- assert.deepStrictEqual(inspect(parser('>>http://host'), ctx), [['<span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span>', '<br>'], '']);
49
- assert.deepStrictEqual(inspect(parser('>>http://host)'), ctx), [['<span class="cite">&gt;<a class="anchor" href="http://host)" target="_blank" data-depth="1">&gt;http://host)</a></span>', '<br>'], '']);
50
- assert.deepStrictEqual(inspect(parser('>>http://host '), ctx), [['<span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span>', '<br>'], '']);
51
- assert.deepStrictEqual(inspect(parser('>>http://host\n'), ctx), [['<span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span>', '<br>'], '']);
52
- assert.deepStrictEqual(inspect(parser('>>https://host'), ctx), [['<span class="cite">&gt;<a class="anchor" href="https://host" target="_blank" data-depth="1">&gt;https://host</a></span>', '<br>'], '']);
31
+ assert.deepStrictEqual(inspect(parser, input('>>0', new Context())), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '']);
32
+ assert.deepStrictEqual(inspect(parser, input('>>0 ', new Context())), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '']);
33
+ assert.deepStrictEqual(inspect(parser, input('>>0\n', new Context())), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '']);
34
+ assert.deepStrictEqual(inspect(parser, input('>>>0', new Context())), [['<span class="cite">&gt;&gt;<a class="anchor" href="?at=0" data-depth="2">&gt;0</a></span>', '<br>'], '']);
35
+ assert.deepStrictEqual(inspect(parser, input('>>0\n1', new Context())), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '1']);
36
+ assert.deepStrictEqual(inspect(parser, input('>>0\n>1', new Context())), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '>1']);
37
+ assert.deepStrictEqual(inspect(parser, input('>>0\n>>', new Context())), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>'], '>>']);
38
+ assert.deepStrictEqual(inspect(parser, input('>>0\n>>1', new Context())), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>', '<span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span>', '<br>'], '']);
39
+ assert.deepStrictEqual(inspect(parser, input('>>0\n>>>1', new Context())), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>', '<span class="cite">&gt;&gt;<a class="anchor" href="?at=1" data-depth="2">&gt;1</a></span>', '<br>'], '']);
40
+ assert.deepStrictEqual(inspect(parser, input('>>>0\n>>', new Context())), [['<span class="cite">&gt;&gt;<a class="anchor" href="?at=0" data-depth="2">&gt;0</a></span>', '<br>'], '>>']);
41
+ assert.deepStrictEqual(inspect(parser, input('>>>0\n>>1', new Context())), [['<span class="cite">&gt;&gt;<a class="anchor" href="?at=0" data-depth="2">&gt;0</a></span>', '<br>', '<span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span>', '<br>'], '']);
42
+ assert.deepStrictEqual(inspect(parser, input('>>#', new Context())), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#</a></span>', '<br>'], '']);
43
+ assert.deepStrictEqual(inspect(parser, input('>># ', new Context())), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#</a></span>', '<br>'], '']);
44
+ assert.deepStrictEqual(inspect(parser, input('>>#\n', new Context())), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#</a></span>', '<br>'], '']);
45
+ assert.deepStrictEqual(inspect(parser, input('>>#a', new Context())), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#a</a></span>', '<br>'], '']);
46
+ assert.deepStrictEqual(inspect(parser, input('>>#index::a', new Context())), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#index::a</a></span>', '<br>'], '']);
47
+ assert.deepStrictEqual(inspect(parser, input('>>#:~:text=a', new Context())), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#:~:text=a</a></span>', '<br>'], '']);
48
+ assert.deepStrictEqual(inspect(parser, input('>>http://host', new Context())), [['<span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span>', '<br>'], '']);
49
+ assert.deepStrictEqual(inspect(parser, input('>>http://host)', new Context())), [['<span class="cite">&gt;<a class="anchor" href="http://host)" target="_blank" data-depth="1">&gt;http://host)</a></span>', '<br>'], '']);
50
+ assert.deepStrictEqual(inspect(parser, input('>>http://host ', new Context())), [['<span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span>', '<br>'], '']);
51
+ assert.deepStrictEqual(inspect(parser, input('>>http://host\n', new Context())), [['<span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span>', '<br>'], '']);
52
+ assert.deepStrictEqual(inspect(parser, input('>>https://host', new Context())), [['<span class="cite">&gt;<a class="anchor" href="https://host" target="_blank" data-depth="1">&gt;https://host</a></span>', '<br>'], '']);
53
53
  });
54
54
 
55
55
  });
@@ -1,5 +1,5 @@
1
1
  import { ReplyParser } from '../../block';
2
- import { List, Data } from '../../../combinator/data/parser';
2
+ import { List, Node } from '../../../combinator/data/parser';
3
3
  import { union, line, focus, open, fmap } from '../../../combinator';
4
4
  import { anchor } from '../../inline/autolink/anchor';
5
5
  import { str } from '../../source';
@@ -15,15 +15,15 @@ export const cite: ReplyParser.CiteParser = line(fmap(
15
15
  line(anchor),
16
16
  // Subject page representation.
17
17
  // リンクの実装は後で検討
18
- focus(/>>#\S*(?=\s*$)/y, ({ context: { source } }) => new List([new Data(html('a', { class: 'anchor' }, source))])),
19
- focus(/>>https?:\/\/\S+(?=\s*$)/y, ({ context: { source } }) => new List([new Data(html('a', { class: 'anchor', href: source.slice(2).trimEnd(), target: '_blank' }, source))])),
20
- focus(/>>\S+(?=\s*$)/y, ({ context: { source } }) => new List([new Data(source)])),
18
+ focus(/>>#\S*(?=\s*$)/y, ({ context: { source } }) => new List([new Node(html('a', { class: 'anchor' }, source))])),
19
+ focus(/>>https?:\/\/\S+(?=\s*$)/y, ({ context: { source } }) => new List([new Node(html('a', { class: 'anchor', href: source.slice(2).trimEnd(), target: '_blank' }, source))])),
20
+ focus(/>>\S+(?=\s*$)/y, ({ context: { source } }) => new List([new Node(source)])),
21
21
  ])),
22
22
  nodes => {
23
23
  const quotes = nodes.head!.value as string;
24
24
  const node = nodes.last!.value;
25
25
  return new List([
26
- new Data(html('span',
26
+ new Node(html('span',
27
27
  typeof node === 'object'
28
28
  ? { class: 'cite' }
29
29
  : { class: 'cite invalid', ...invalid('cite', 'syntax', 'Invalid syntax') },
@@ -33,6 +33,6 @@ export const cite: ReplyParser.CiteParser = line(fmap(
33
33
  ? define(node, { 'data-depth': `${quotes.length + 1}` }, node.innerText.slice(1))
34
34
  : node.slice(1),
35
35
  ]))),
36
- new Data(html('br')),
36
+ new Node(html('br')),
37
37
  ]);
38
38
  }));
@@ -1,66 +1,66 @@
1
1
  import { quote } from './quote';
2
2
  import { some } from '../../../combinator';
3
3
  import { input } from '../../../combinator/data/parser';
4
+ import { Context } from '../../context';
4
5
  import { inspect } from '../../../debug.test';
5
6
 
6
7
  describe('Unit: parser/block/reply/quote', () => {
7
8
  describe('quote', () => {
8
- const parser = (source: string) => some(quote)(input(source, ctx));
9
- const { context: ctx } = input('', {});
9
+ const parser = some(quote);
10
10
 
11
11
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
- assert.deepStrictEqual(inspect(parser('>'), ctx), undefined);
14
- assert.deepStrictEqual(inspect(parser('>\n'), ctx), undefined);
15
- assert.deepStrictEqual(inspect(parser('>>'), ctx), undefined);
16
- assert.deepStrictEqual(inspect(parser('>0'), ctx), undefined);
17
- assert.deepStrictEqual(inspect(parser('>>0'), ctx), undefined);
18
- assert.deepStrictEqual(inspect(parser('>0A'), ctx), undefined);
19
- assert.deepStrictEqual(inspect(parser('>>0A'), ctx), undefined);
20
- assert.deepStrictEqual(inspect(parser('>0 a'), ctx), undefined);
21
- assert.deepStrictEqual(inspect(parser('>>0 a'), ctx), undefined);
22
- assert.deepStrictEqual(inspect(parser('>A'), ctx), undefined);
23
- assert.deepStrictEqual(inspect(parser('>A 0'), ctx), undefined);
24
- assert.deepStrictEqual(inspect(parser('>/'), ctx), undefined);
25
- assert.deepStrictEqual(inspect(parser('>\\'), ctx), undefined);
26
- assert.deepStrictEqual(inspect(parser('>>01#'), ctx), undefined);
27
- assert.deepStrictEqual(inspect(parser('>>01@'), ctx), undefined);
28
- assert.deepStrictEqual(inspect(parser('>>https://host'), ctx), undefined);
29
- assert.deepStrictEqual(inspect(parser('>>tel:1234567890'), ctx), undefined);
30
- assert.deepStrictEqual(inspect(parser('>#a'), ctx), undefined);
31
- assert.deepStrictEqual(inspect(parser('>A\n> b'), ctx), undefined);
32
- assert.deepStrictEqual(inspect(parser(' > 0'), ctx), undefined);
33
- assert.deepStrictEqual(inspect(parser('\\> 0'), ctx), undefined);
12
+ assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
13
+ assert.deepStrictEqual(inspect(parser, input('>', new Context())), undefined);
14
+ assert.deepStrictEqual(inspect(parser, input('>\n', new Context())), undefined);
15
+ assert.deepStrictEqual(inspect(parser, input('>>', new Context())), undefined);
16
+ assert.deepStrictEqual(inspect(parser, input('>0', new Context())), undefined);
17
+ assert.deepStrictEqual(inspect(parser, input('>>0', new Context())), undefined);
18
+ assert.deepStrictEqual(inspect(parser, input('>0A', new Context())), undefined);
19
+ assert.deepStrictEqual(inspect(parser, input('>>0A', new Context())), undefined);
20
+ assert.deepStrictEqual(inspect(parser, input('>0 a', new Context())), undefined);
21
+ assert.deepStrictEqual(inspect(parser, input('>>0 a', new Context())), undefined);
22
+ assert.deepStrictEqual(inspect(parser, input('>A', new Context())), undefined);
23
+ assert.deepStrictEqual(inspect(parser, input('>A 0', new Context())), undefined);
24
+ assert.deepStrictEqual(inspect(parser, input('>/', new Context())), undefined);
25
+ assert.deepStrictEqual(inspect(parser, input('>\\', new Context())), undefined);
26
+ assert.deepStrictEqual(inspect(parser, input('>>01#', new Context())), undefined);
27
+ assert.deepStrictEqual(inspect(parser, input('>>01@', new Context())), undefined);
28
+ assert.deepStrictEqual(inspect(parser, input('>>https://host', new Context())), undefined);
29
+ assert.deepStrictEqual(inspect(parser, input('>>tel:1234567890', new Context())), undefined);
30
+ assert.deepStrictEqual(inspect(parser, input('>#a', new Context())), undefined);
31
+ assert.deepStrictEqual(inspect(parser, input('>A\n> b', new Context())), undefined);
32
+ assert.deepStrictEqual(inspect(parser, input(' > 0', new Context())), undefined);
33
+ assert.deepStrictEqual(inspect(parser, input('\\> 0', new Context())), undefined);
34
34
  });
35
35
 
36
36
  it('valid', () => {
37
- assert.deepStrictEqual(inspect(parser('> '), ctx), [['<span class="quote">&gt; </span>', '<br>'], '']);
38
- assert.deepStrictEqual(inspect(parser('> 0'), ctx), [['<span class="quote">&gt; 0</span>', '<br>'], '']);
39
- assert.deepStrictEqual(inspect(parser('> a'), ctx), [['<span class="quote">&gt; a</span>', '<br>'], '']);
40
- assert.deepStrictEqual(inspect(parser('> a '), ctx), [['<span class="quote">&gt; a </span>', '<br>'], '']);
41
- assert.deepStrictEqual(inspect(parser('> a b'), ctx), [['<span class="quote">&gt; a b</span>', '<br>'], '']);
42
- assert.deepStrictEqual(inspect(parser('> a\n'), ctx), [['<span class="quote">&gt; a</span>', '<br>'], '']);
43
- assert.deepStrictEqual(inspect(parser('> A'), ctx), [['<span class="quote">&gt; A</span>', '<br>'], '']);
44
- assert.deepStrictEqual(inspect(parser('>> 0'), ctx), [['<span class="quote">&gt;&gt; 0</span>', '<br>'], '']);
45
- assert.deepStrictEqual(inspect(parser('> 0\na'), ctx), [['<span class="quote">&gt; 0</span>', '<br>'], 'a']);
46
- assert.deepStrictEqual(inspect(parser('> 0\n>'), ctx), [['<span class="quote">&gt; 0</span>', '<br>'], '>']);
47
- assert.deepStrictEqual(inspect(parser('> 0\n> '), ctx), [['<span class="quote">&gt; 0<br>&gt; </span>', '<br>'], '']);
48
- assert.deepStrictEqual(inspect(parser('> 0\n> 1'), ctx), [['<span class="quote">&gt; 0<br>&gt; 1</span>', '<br>'], '']);
49
- assert.deepStrictEqual(inspect(parser('> 0\n>> 1'), ctx), [['<span class="quote">&gt; 0<br>&gt;&gt; 1</span>', '<br>'], '']);
50
- assert.deepStrictEqual(inspect(parser('>> 0\n> 1'), ctx), [['<span class="quote">&gt;&gt; 0<br>&gt; 1</span>', '<br>'], '']);
51
- assert.deepStrictEqual(inspect(parser('> \\'), ctx), [['<span class="quote">&gt; \\</span>', '<br>'], '']);
52
- assert.deepStrictEqual(inspect(parser('> >>0\n> > b'), ctx), [['<span class="quote">&gt; <a class="anchor" href="?at=0">&gt;&gt;0</a><br>&gt; &gt; b</span>', '<br>'], '']);
53
- assert.deepStrictEqual(inspect(parser('> >>0\n> > b\n> c'), ctx), [['<span class="quote">&gt; <a class="anchor" href="?at=0">&gt;&gt;0</a><br>&gt; &gt; b<br>&gt; c</span>', '<br>'], '']);
54
- assert.deepStrictEqual(inspect(parser('> > a\n> > b\n> > c'), ctx), [['<span class="quote">&gt; &gt; a<br>&gt; &gt; b<br>&gt; &gt; c</span>', '<br>'], '']);
55
- assert.deepStrictEqual(inspect(parser('> > > a\n> > > b'), ctx), [['<span class="quote">&gt; &gt; &gt; a<br>&gt; &gt; &gt; b</span>', '<br>'], '']);
56
- assert.deepStrictEqual(inspect(parser('> #a'), ctx), [['<span class="quote">&gt; <a class="hashtag" href="/hashtags/a">#a</a></span>', '<br>'], '']);
57
- assert.deepStrictEqual(inspect(parser('> $-a, $-b'), ctx), [['<span class="quote">&gt; $-a, $-b</span>', '<br>'], '']);
58
- assert.deepStrictEqual(inspect(parser('> $a=b$'), ctx), [['<span class="quote">&gt; <span class="math" translate="no" data-src="$a=b$">$a=b$</span></span>', '<br>'], '']);
59
- assert.deepStrictEqual(inspect(parser('> ${a}$'), ctx), [['<span class="quote">&gt; <span class="math" translate="no" data-src="${a}$">${a}$</span></span>', '<br>'], '']);
60
- assert.deepStrictEqual(inspect(parser('> http://host)'), ctx), [['<span class="quote">&gt; <a class="url" href="http://host)" target="_blank">http://host)</a></span>', '<br>'], '']);
61
- assert.deepStrictEqual(inspect(parser('> a\n> http://host) \n> b'), ctx), [['<span class="quote">&gt; a<br>&gt; <a class="url" href="http://host)" target="_blank">http://host)</a> <br>&gt; b</span>', '<br>'], '']);
62
- assert.deepStrictEqual(inspect(parser('> !http://host)'), ctx), [['<span class="quote">&gt; !<a class="url" href="http://host)" target="_blank">http://host)</a></span>', '<br>'], '']);
63
- assert.deepStrictEqual(inspect(parser('> a\n> !http://host) \n> b'), ctx), [['<span class="quote">&gt; a<br>&gt; !<a class="url" href="http://host)" target="_blank">http://host)</a> <br>&gt; b</span>', '<br>'], '']);
37
+ assert.deepStrictEqual(inspect(parser, input('> ', new Context())), [['<span class="quote">&gt; </span>', '<br>'], '']);
38
+ assert.deepStrictEqual(inspect(parser, input('> 0', new Context())), [['<span class="quote">&gt; 0</span>', '<br>'], '']);
39
+ assert.deepStrictEqual(inspect(parser, input('> a', new Context())), [['<span class="quote">&gt; a</span>', '<br>'], '']);
40
+ assert.deepStrictEqual(inspect(parser, input('> a ', new Context())), [['<span class="quote">&gt; a </span>', '<br>'], '']);
41
+ assert.deepStrictEqual(inspect(parser, input('> a b', new Context())), [['<span class="quote">&gt; a b</span>', '<br>'], '']);
42
+ assert.deepStrictEqual(inspect(parser, input('> a\n', new Context())), [['<span class="quote">&gt; a</span>', '<br>'], '']);
43
+ assert.deepStrictEqual(inspect(parser, input('> A', new Context())), [['<span class="quote">&gt; A</span>', '<br>'], '']);
44
+ assert.deepStrictEqual(inspect(parser, input('>> 0', new Context())), [['<span class="quote">&gt;&gt; 0</span>', '<br>'], '']);
45
+ assert.deepStrictEqual(inspect(parser, input('> 0\na', new Context())), [['<span class="quote">&gt; 0</span>', '<br>'], 'a']);
46
+ assert.deepStrictEqual(inspect(parser, input('> 0\n>', new Context())), [['<span class="quote">&gt; 0</span>', '<br>'], '>']);
47
+ assert.deepStrictEqual(inspect(parser, input('> 0\n> ', new Context())), [['<span class="quote">&gt; 0<br>&gt; </span>', '<br>'], '']);
48
+ assert.deepStrictEqual(inspect(parser, input('> 0\n> 1', new Context())), [['<span class="quote">&gt; 0<br>&gt; 1</span>', '<br>'], '']);
49
+ assert.deepStrictEqual(inspect(parser, input('> 0\n>> 1', new Context())), [['<span class="quote">&gt; 0<br>&gt;&gt; 1</span>', '<br>'], '']);
50
+ assert.deepStrictEqual(inspect(parser, input('>> 0\n> 1', new Context())), [['<span class="quote">&gt;&gt; 0<br>&gt; 1</span>', '<br>'], '']);
51
+ assert.deepStrictEqual(inspect(parser, input('> \\', new Context())), [['<span class="quote">&gt; \\</span>', '<br>'], '']);
52
+ assert.deepStrictEqual(inspect(parser, input('> >>0\n> > b', new Context())), [['<span class="quote">&gt; <a class="anchor" href="?at=0">&gt;&gt;0</a><br>&gt; &gt; b</span>', '<br>'], '']);
53
+ assert.deepStrictEqual(inspect(parser, input('> >>0\n> > b\n> c', new Context())), [['<span class="quote">&gt; <a class="anchor" href="?at=0">&gt;&gt;0</a><br>&gt; &gt; b<br>&gt; c</span>', '<br>'], '']);
54
+ assert.deepStrictEqual(inspect(parser, input('> > a\n> > b\n> > c', new Context())), [['<span class="quote">&gt; &gt; a<br>&gt; &gt; b<br>&gt; &gt; c</span>', '<br>'], '']);
55
+ assert.deepStrictEqual(inspect(parser, input('> > > a\n> > > b', new Context())), [['<span class="quote">&gt; &gt; &gt; a<br>&gt; &gt; &gt; b</span>', '<br>'], '']);
56
+ assert.deepStrictEqual(inspect(parser, input('> #a', new Context())), [['<span class="quote">&gt; <a class="hashtag" href="/hashtags/a">#a</a></span>', '<br>'], '']);
57
+ assert.deepStrictEqual(inspect(parser, input('> $-a, $-b', new Context())), [['<span class="quote">&gt; $-a, $-b</span>', '<br>'], '']);
58
+ assert.deepStrictEqual(inspect(parser, input('> $a=b$', new Context())), [['<span class="quote">&gt; <span class="math" translate="no" data-src="$a=b$">$a=b$</span></span>', '<br>'], '']);
59
+ assert.deepStrictEqual(inspect(parser, input('> ${a}$', new Context())), [['<span class="quote">&gt; <span class="math" translate="no" data-src="${a}$">${a}$</span></span>', '<br>'], '']);
60
+ assert.deepStrictEqual(inspect(parser, input('> http://host)', new Context())), [['<span class="quote">&gt; <a class="url" href="http://host)" target="_blank">http://host)</a></span>', '<br>'], '']);
61
+ assert.deepStrictEqual(inspect(parser, input('> a\n> http://host) \n> b', new Context())), [['<span class="quote">&gt; a<br>&gt; <a class="url" href="http://host)" target="_blank">http://host)</a> <br>&gt; b</span>', '<br>'], '']);
62
+ assert.deepStrictEqual(inspect(parser, input('> !http://host)', new Context())), [['<span class="quote">&gt; !<a class="url" href="http://host)" target="_blank">http://host)</a></span>', '<br>'], '']);
63
+ assert.deepStrictEqual(inspect(parser, input('> a\n> !http://host) \n> b', new Context())), [['<span class="quote">&gt; a<br>&gt; !<a class="url" href="http://host)" target="_blank">http://host)</a> <br>&gt; b</span>', '<br>'], '']);
64
64
  });
65
65
 
66
66
  });
@@ -1,5 +1,5 @@
1
1
  import { ReplyParser } from '../../block';
2
- import { List, Data } from '../../../combinator/data/parser';
2
+ import { List, Node } from '../../../combinator/data/parser';
3
3
  import { union, some, block, validate, rewrite, convert, lazy, fmap } from '../../../combinator';
4
4
  import { math } from '../../inline/math';
5
5
  import { autolink } from '../../inline/autolink';
@@ -21,7 +21,7 @@ export const quote: ReplyParser.QuoteParser = lazy(() => block(fmap(
21
21
  unescsource,
22
22
  ])))),
23
23
  (ns, { source, position }) => new List([
24
- new Data(source[position - 1] === '\n' ? ns.pop()!.value as HTMLBRElement : html('br')),
25
- new Data(html('span', { class: 'quote' }, defrag(unwrap(ns)))),
24
+ new Node(source[position - 1] === '\n' ? ns.pop()!.value as HTMLBRElement : html('br')),
25
+ new Node(html('span', { class: 'quote' }, defrag(unwrap(ns)))),
26
26
  ].reverse())),
27
27
  false));
@@ -1,35 +1,35 @@
1
1
  import { reply } from './reply';
2
2
  import { some } from '../../combinator';
3
3
  import { input } from '../../combinator/data/parser';
4
+ import { Context } from '../context';
4
5
  import { inspect } from '../../debug.test';
5
6
 
6
7
  describe('Unit: parser/block/reply', () => {
7
8
  describe('reply', () => {
8
- const parser = (source: string) => some(reply)(input(source, ctx));
9
- const { context: ctx } = input('', {});
9
+ const parser = some(reply);
10
10
 
11
11
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser('>'), ctx), undefined);
13
- assert.deepStrictEqual(inspect(parser('>1'), ctx), undefined);
14
- assert.deepStrictEqual(inspect(parser('>>'), ctx), undefined);
15
- assert.deepStrictEqual(inspect(parser('>>1 a'), ctx), undefined);
16
- assert.deepStrictEqual(inspect(parser('> '), ctx), undefined);
17
- assert.deepStrictEqual(inspect(parser('> a'), ctx), undefined);
18
- assert.deepStrictEqual(inspect(parser('>\n'), ctx), undefined);
12
+ assert.deepStrictEqual(inspect(parser, input('>', new Context())), undefined);
13
+ assert.deepStrictEqual(inspect(parser, input('>1', new Context())), undefined);
14
+ assert.deepStrictEqual(inspect(parser, input('>>', new Context())), undefined);
15
+ assert.deepStrictEqual(inspect(parser, input('>>1 a', new Context())), undefined);
16
+ assert.deepStrictEqual(inspect(parser, input('> ', new Context())), undefined);
17
+ assert.deepStrictEqual(inspect(parser, input('> a', new Context())), undefined);
18
+ assert.deepStrictEqual(inspect(parser, input('>\n', new Context())), undefined);
19
19
  });
20
20
 
21
21
  it('basic', () => {
22
- assert.deepStrictEqual(inspect(parser('>>1'), ctx), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span></p>'], '']);
23
- assert.deepStrictEqual(inspect(parser('>>1\na'), ctx), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a</p>'], '']);
24
- assert.deepStrictEqual(inspect(parser('>>1\na\n>>2'), ctx), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a<br><span class="cite">&gt;<a class="anchor" href="?at=2" data-depth="1">&gt;2</a></span></p>'], '']);
25
- assert.deepStrictEqual(inspect(parser('>>1\na\n>>2 b'), ctx), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a<br><a class="anchor" href="?at=2">&gt;&gt;2</a> b</p>'], '']);
26
- assert.deepStrictEqual(inspect(parser('>>1\na\n> b'), ctx), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a<br><span class="quote">&gt; b</span></p>'], '']);
27
- assert.deepStrictEqual(inspect(parser('>>1\n>>2'), ctx), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="cite">&gt;<a class="anchor" href="?at=2" data-depth="1">&gt;2</a></span></p>'], '']);
28
- assert.deepStrictEqual(inspect(parser('>>1\n> a'), ctx), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span></p>'], '']);
29
- assert.deepStrictEqual(inspect(parser('>>1\n> a\nb'), ctx), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br>b</p>'], '']);
30
- assert.deepStrictEqual(inspect(parser('>>1\n> a\n>>2'), ctx), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br><span class="cite">&gt;<a class="anchor" href="?at=2" data-depth="1">&gt;2</a></span></p>'], '']);
31
- assert.deepStrictEqual(inspect(parser('>>1\n> a\n>> b'), ctx), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a<br>&gt;&gt; b</span></p>'], '']);
32
- assert.deepStrictEqual(inspect(parser('>>http://host\n>>http://host'), ctx), [['<p><span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span><br><span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span></p>'], '']);
22
+ assert.deepStrictEqual(inspect(parser, input('>>1', new Context())), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span></p>'], '']);
23
+ assert.deepStrictEqual(inspect(parser, input('>>1\na', new Context())), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a</p>'], '']);
24
+ assert.deepStrictEqual(inspect(parser, input('>>1\na\n>>2', new Context())), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a<br><span class="cite">&gt;<a class="anchor" href="?at=2" data-depth="1">&gt;2</a></span></p>'], '']);
25
+ assert.deepStrictEqual(inspect(parser, input('>>1\na\n>>2 b', new Context())), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a<br><a class="anchor" href="?at=2">&gt;&gt;2</a> b</p>'], '']);
26
+ assert.deepStrictEqual(inspect(parser, input('>>1\na\n> b', new Context())), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a<br><span class="quote">&gt; b</span></p>'], '']);
27
+ assert.deepStrictEqual(inspect(parser, input('>>1\n>>2', new Context())), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="cite">&gt;<a class="anchor" href="?at=2" data-depth="1">&gt;2</a></span></p>'], '']);
28
+ assert.deepStrictEqual(inspect(parser, input('>>1\n> a', new Context())), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span></p>'], '']);
29
+ assert.deepStrictEqual(inspect(parser, input('>>1\n> a\nb', new Context())), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br>b</p>'], '']);
30
+ assert.deepStrictEqual(inspect(parser, input('>>1\n> a\n>>2', new Context())), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br><span class="cite">&gt;<a class="anchor" href="?at=2" data-depth="1">&gt;2</a></span></p>'], '']);
31
+ assert.deepStrictEqual(inspect(parser, input('>>1\n> a\n>> b', new Context())), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a<br>&gt;&gt; b</span></p>'], '']);
32
+ assert.deepStrictEqual(inspect(parser, input('>>http://host\n>>http://host', new Context())), [['<p><span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span><br><span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span></p>'], '']);
33
33
  });
34
34
 
35
35
  });
@@ -1,5 +1,5 @@
1
1
  import { ReplyParser } from '../block';
2
- import { List, Data } from '../../combinator/data/parser';
2
+ import { List, Node } from '../../combinator/data/parser';
3
3
  import { union, some, block, validate, rewrite, fmap } from '../../combinator';
4
4
  import { cite, syntax as csyntax } from './reply/cite';
5
5
  import { quote, syntax as qsyntax } from './reply/quote';
@@ -20,6 +20,6 @@ export const reply: ReplyParser = block(validate(csyntax, fmap(
20
20
  visualize(fmap(some(inline), (ns, { source, position }) =>
21
21
  source[position - 1] === '\n'
22
22
  ? ns
23
- : ns.push(new Data(html('br'))) && ns)))
23
+ : ns.push(new Node(html('br'))) && ns)))
24
24
  ])),
25
- ns => new List([new Data(html('p', defrag(unwrap(trimBlankNodeEnd(ns)))))]))));
25
+ ns => new List([new Node(html('p', defrag(unwrap(trimBlankNodeEnd(ns)))))]))));
@@ -1,66 +1,66 @@
1
1
  import { sidefence } from './sidefence';
2
2
  import { some } from '../../combinator';
3
3
  import { input } from '../../combinator/data/parser';
4
+ import { Context } from '../context';
4
5
  import { inspect } from '../../debug.test';
5
6
 
6
7
  describe('Unit: parser/block/sidefence', () => {
7
8
  describe('sidefence', () => {
8
- const parser = (source: string) => some(sidefence)(input(source, ctx));
9
- const { context: ctx } = input('', {});
9
+ const parser = some(sidefence);
10
10
 
11
11
  it('invalid', () => {
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);
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(' | ', new Context())), undefined);
18
+ assert.deepStrictEqual(inspect(parser, input('||', new Context())), undefined);
19
19
  });
20
20
 
21
21
  it('basic', () => {
22
- assert.deepStrictEqual(inspect(parser('| '), ctx), [['<blockquote class="invalid"></blockquote>'], '']);
23
- assert.deepStrictEqual(inspect(parser('| \\'), ctx), [['<blockquote class="invalid"><pre>\\</pre></blockquote>'], '']);
24
- assert.deepStrictEqual(inspect(parser('| \\\n'), ctx), [['<blockquote class="invalid"><pre>\\</pre></blockquote>'], '']);
25
- assert.deepStrictEqual(inspect(parser('| a'), ctx), [['<blockquote class="invalid"><pre>a</pre></blockquote>'], '']);
26
- assert.deepStrictEqual(inspect(parser('| a\n'), ctx), [['<blockquote class="invalid"><pre>a</pre></blockquote>'], '']);
27
- assert.deepStrictEqual(inspect(parser('| a\nb'), ctx), undefined);
28
- assert.deepStrictEqual(inspect(parser('| a\n b '), ctx), undefined);
29
- assert.deepStrictEqual(inspect(parser('| a\n|'), ctx), [['<blockquote class="invalid"><pre>a<br></pre></blockquote>'], '']);
30
- assert.deepStrictEqual(inspect(parser('| a\n>>1'), ctx), undefined);
31
- assert.deepStrictEqual(inspect(parser('| a\n| b '), ctx), [['<blockquote class="invalid"><pre>a<br>b </pre></blockquote>'], '']);
32
- assert.deepStrictEqual(inspect(parser('| a\n|\n'), ctx), [['<blockquote class="invalid"><pre>a<br></pre></blockquote>'], '']);
33
- assert.deepStrictEqual(inspect(parser('| a\n|\nb'), ctx), undefined);
34
- assert.deepStrictEqual(inspect(parser('| a\n|\n b '), ctx), undefined);
35
- assert.deepStrictEqual(inspect(parser('| a\n|\n|'), ctx), [['<blockquote class="invalid"><pre>a<br><br></pre></blockquote>'], '']);
36
- assert.deepStrictEqual(inspect(parser('| a\n|\n>>1'), ctx), undefined);
37
- assert.deepStrictEqual(inspect(parser('| a\n|\n| b '), ctx), [['<blockquote class="invalid"><pre>a<br><br>b </pre></blockquote>'], '']);
38
- assert.deepStrictEqual(inspect(parser('| a\\\nb'), ctx), undefined);
39
- assert.deepStrictEqual(inspect(parser('| a '), ctx), [['<blockquote class="invalid"><pre> a </pre></blockquote>'], '']);
40
- assert.deepStrictEqual(inspect(parser('| \na'), ctx), undefined);
41
- assert.deepStrictEqual(inspect(parser('|\na'), ctx), undefined);
42
- assert.deepStrictEqual(inspect(parser('|\n| a'), ctx), undefined);
43
- assert.deepStrictEqual(inspect(parser('| http://host'), ctx), [['<blockquote class="invalid"><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
44
- assert.deepStrictEqual(inspect(parser('| http://host)'), ctx), [['<blockquote class="invalid"><pre><a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
45
- assert.deepStrictEqual(inspect(parser('| !http://host'), ctx), [['<blockquote class="invalid"><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
46
- assert.deepStrictEqual(inspect(parser('| !http://host)'), ctx), [['<blockquote class="invalid"><pre>!<a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
47
- assert.deepStrictEqual(inspect(parser('| #a'), ctx), [['<blockquote class="invalid"><pre><a class="hashtag" href="/hashtags/a">#a</a></pre></blockquote>'], '']);
48
- assert.deepStrictEqual(inspect(parser('| @a#b'), ctx), [['<blockquote class="invalid"><pre><a class="channel" href="/@a?ch=b">@a#b</a></pre></blockquote>'], '']);
49
- assert.deepStrictEqual(inspect(parser('| >>1\n| | b'), ctx), [['<blockquote class="invalid"><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>| b</pre></blockquote>'], '']);
50
- assert.deepStrictEqual(inspect(parser('| >>1\n| | b\n| c'), ctx), [['<blockquote class="invalid"><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>| b<br>c</pre></blockquote>'], '']);
22
+ assert.deepStrictEqual(inspect(parser, input('| ', new Context())), [['<blockquote class="invalid"></blockquote>'], '']);
23
+ assert.deepStrictEqual(inspect(parser, input('| \\', new Context())), [['<blockquote class="invalid"><pre>\\</pre></blockquote>'], '']);
24
+ assert.deepStrictEqual(inspect(parser, input('| \\\n', new Context())), [['<blockquote class="invalid"><pre>\\</pre></blockquote>'], '']);
25
+ assert.deepStrictEqual(inspect(parser, input('| a', new Context())), [['<blockquote class="invalid"><pre>a</pre></blockquote>'], '']);
26
+ assert.deepStrictEqual(inspect(parser, input('| a\n', new Context())), [['<blockquote class="invalid"><pre>a</pre></blockquote>'], '']);
27
+ assert.deepStrictEqual(inspect(parser, input('| a\nb', new Context())), undefined);
28
+ assert.deepStrictEqual(inspect(parser, input('| a\n b ', new Context())), undefined);
29
+ assert.deepStrictEqual(inspect(parser, input('| a\n|', new Context())), [['<blockquote class="invalid"><pre>a<br></pre></blockquote>'], '']);
30
+ assert.deepStrictEqual(inspect(parser, input('| a\n>>1', new Context())), undefined);
31
+ assert.deepStrictEqual(inspect(parser, input('| a\n| b ', new Context())), [['<blockquote class="invalid"><pre>a<br>b </pre></blockquote>'], '']);
32
+ assert.deepStrictEqual(inspect(parser, input('| a\n|\n', new Context())), [['<blockquote class="invalid"><pre>a<br></pre></blockquote>'], '']);
33
+ assert.deepStrictEqual(inspect(parser, input('| a\n|\nb', new Context())), undefined);
34
+ assert.deepStrictEqual(inspect(parser, input('| a\n|\n b ', new Context())), undefined);
35
+ assert.deepStrictEqual(inspect(parser, input('| a\n|\n|', new Context())), [['<blockquote class="invalid"><pre>a<br><br></pre></blockquote>'], '']);
36
+ assert.deepStrictEqual(inspect(parser, input('| a\n|\n>>1', new Context())), undefined);
37
+ assert.deepStrictEqual(inspect(parser, input('| a\n|\n| b ', new Context())), [['<blockquote class="invalid"><pre>a<br><br>b </pre></blockquote>'], '']);
38
+ assert.deepStrictEqual(inspect(parser, input('| a\\\nb', new Context())), undefined);
39
+ assert.deepStrictEqual(inspect(parser, input('| a ', new Context())), [['<blockquote class="invalid"><pre> a </pre></blockquote>'], '']);
40
+ assert.deepStrictEqual(inspect(parser, input('| \na', new Context())), undefined);
41
+ assert.deepStrictEqual(inspect(parser, input('|\na', new Context())), undefined);
42
+ assert.deepStrictEqual(inspect(parser, input('|\n| a', new Context())), undefined);
43
+ assert.deepStrictEqual(inspect(parser, input('| http://host', new Context())), [['<blockquote class="invalid"><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
44
+ assert.deepStrictEqual(inspect(parser, input('| http://host)', new Context())), [['<blockquote class="invalid"><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 class="invalid"><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 class="invalid"><pre>!<a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
47
+ assert.deepStrictEqual(inspect(parser, input('| #a', new Context())), [['<blockquote class="invalid"><pre><a class="hashtag" href="/hashtags/a">#a</a></pre></blockquote>'], '']);
48
+ assert.deepStrictEqual(inspect(parser, input('| @a#b', new Context())), [['<blockquote class="invalid"><pre><a class="channel" href="/@a?ch=b">@a#b</a></pre></blockquote>'], '']);
49
+ assert.deepStrictEqual(inspect(parser, input('| >>1\n| | b', new Context())), [['<blockquote class="invalid"><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>| b</pre></blockquote>'], '']);
50
+ assert.deepStrictEqual(inspect(parser, input('| >>1\n| | b\n| c', new Context())), [['<blockquote class="invalid"><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>| b<br>c</pre></blockquote>'], '']);
51
51
  });
52
52
 
53
53
  it('nest', () => {
54
- assert.deepStrictEqual(inspect(parser('| a\n||'), ctx), [['<blockquote class="invalid"><pre>a</pre><blockquote></blockquote></blockquote>'], '']);
55
- assert.deepStrictEqual(inspect(parser('| a\n|| b\n| c'), ctx), [['<blockquote class="invalid"><pre>a</pre><blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
56
- assert.deepStrictEqual(inspect(parser('| a\n|| b\n|| c'), ctx), [['<blockquote class="invalid"><pre>a</pre><blockquote><pre>b<br>c</pre></blockquote></blockquote>'], '']);
57
- assert.deepStrictEqual(inspect(parser('| a\n|| b\n||| c'), ctx), [['<blockquote class="invalid"><pre>a</pre><blockquote><pre>b</pre><blockquote><pre>c</pre></blockquote></blockquote></blockquote>'], '']);
58
- assert.deepStrictEqual(inspect(parser('|| a'), ctx), [['<blockquote class="invalid"><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
59
- assert.deepStrictEqual(inspect(parser('|| a\n|'), ctx), [['<blockquote class="invalid"><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
60
- assert.deepStrictEqual(inspect(parser('|| a\n| b'), ctx), [['<blockquote class="invalid"><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote>'], '']);
61
- assert.deepStrictEqual(inspect(parser('|| a\n||| b\n| c'), ctx), [['<blockquote class="invalid"><blockquote><pre>a</pre><blockquote><pre>b</pre></blockquote></blockquote><pre>c</pre></blockquote>'], '']);
62
- assert.deepStrictEqual(inspect(parser('|| a\n| b\n||| c'), ctx), [['<blockquote class="invalid"><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'), ctx), [['<blockquote class="invalid"><blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
54
+ assert.deepStrictEqual(inspect(parser, input('| a\n||', new Context())), [['<blockquote class="invalid"><pre>a</pre><blockquote></blockquote></blockquote>'], '']);
55
+ assert.deepStrictEqual(inspect(parser, input('| a\n|| b\n| c', new Context())), [['<blockquote class="invalid"><pre>a</pre><blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
56
+ assert.deepStrictEqual(inspect(parser, input('| a\n|| b\n|| c', new Context())), [['<blockquote class="invalid"><pre>a</pre><blockquote><pre>b<br>c</pre></blockquote></blockquote>'], '']);
57
+ assert.deepStrictEqual(inspect(parser, input('| a\n|| b\n||| c', new Context())), [['<blockquote class="invalid"><pre>a</pre><blockquote><pre>b</pre><blockquote><pre>c</pre></blockquote></blockquote></blockquote>'], '']);
58
+ assert.deepStrictEqual(inspect(parser, input('|| a', new Context())), [['<blockquote class="invalid"><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
59
+ assert.deepStrictEqual(inspect(parser, input('|| a\n|', new Context())), [['<blockquote class="invalid"><blockquote><pre>a</pre></blockquote></blockquote>'], '']);
60
+ assert.deepStrictEqual(inspect(parser, input('|| a\n| b', new Context())), [['<blockquote class="invalid"><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote>'], '']);
61
+ assert.deepStrictEqual(inspect(parser, input('|| a\n||| b\n| c', new Context())), [['<blockquote class="invalid"><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', new Context())), [['<blockquote class="invalid"><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', new Context())), [['<blockquote class="invalid"><blockquote><blockquote><pre>a</pre></blockquote><pre>b</pre></blockquote><pre>c</pre></blockquote>'], '']);
64
64
  });
65
65
 
66
66
  });
@@ -1,6 +1,6 @@
1
1
  import { SidefenceParser } from '../block';
2
2
  import { Recursion } from '../context';
3
- import { List, Data } from '../../combinator/data/parser';
3
+ import { List, Node } from '../../combinator/data/parser';
4
4
  import { union, some, recursion, block, focus, rewrite, convert, lazy, fmap } from '../../combinator';
5
5
  import { autolink } from '../autolink';
6
6
  import { contentline } from '../source';
@@ -11,7 +11,7 @@ export const sidefence: SidefenceParser = lazy(() => block(fmap(focus(
11
11
  /\|+ [^\n]*(?:\n\|+(?=$|[ \n])[^\n]*)*(?:$|\n)/y,
12
12
  union([source])),
13
13
  ([{ value }]) => new List([
14
- new Data(define(value, {
14
+ new Node(define(value, {
15
15
  class: 'invalid',
16
16
  ...invalid('sidefence', 'syntax', 'Reserved syntax'),
17
17
  })),
@@ -27,6 +27,6 @@ const source: SidefenceParser.SourceParser = lazy(() => fmap(
27
27
  convert(unindent, source, true)),
28
28
  rewrite(
29
29
  some(contentline, opener),
30
- convert(unindent, fmap(autolink, ns => new List([new Data(html('pre', defrag(unwrap(ns))))])), true)),
30
+ convert(unindent, fmap(autolink, ns => new List([new Node(html('pre', defrag(unwrap(ns))))])), true)),
31
31
  ]))),
32
- ns => new List([new Data(html('blockquote', unwrap(ns)))])));
32
+ ns => new List([new Node(html('blockquote', unwrap(ns)))])));