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,148 +1,148 @@
1
1
  import { olist } from './olist';
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/olist', () => {
7
8
  describe('olist', () => {
8
- const parser = (source: string) => some(olist)(input(source, ctx));
9
- const { context: ctx } = input('', {});
9
+ const parser = some(olist);
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('1a. '), ctx), undefined);
15
- assert.deepStrictEqual(inspect(parser('a1. '), ctx), undefined);
16
- assert.deepStrictEqual(inspect(parser('aZ. '), ctx), undefined);
17
- assert.deepStrictEqual(inspect(parser('Az. '), ctx), undefined);
18
- assert.deepStrictEqual(inspect(parser('1'), ctx), undefined);
19
- assert.deepStrictEqual(inspect(parser('1 '), ctx), undefined);
20
- assert.deepStrictEqual(inspect(parser('1\n'), ctx), undefined);
21
- assert.deepStrictEqual(inspect(parser('1.'), ctx), undefined);
22
- assert.deepStrictEqual(inspect(parser('1.a'), ctx), undefined);
23
- assert.deepStrictEqual(inspect(parser('1'), ctx), undefined);
24
- assert.deepStrictEqual(inspect(parser('1 '), ctx), undefined);
25
- assert.deepStrictEqual(inspect(parser('1\n'), ctx), undefined);
26
- assert.deepStrictEqual(inspect(parser('1.'), ctx), undefined);
27
- assert.deepStrictEqual(inspect(parser('1.1'), ctx), undefined);
28
- assert.deepStrictEqual(inspect(parser('1.1.'), ctx), undefined);
29
- assert.deepStrictEqual(inspect(parser('1.a'), ctx), undefined);
30
- assert.deepStrictEqual(inspect(parser('1.\n'), ctx), undefined);
31
- assert.deepStrictEqual(inspect(parser('1.\n1. a'), ctx), undefined);
32
- assert.deepStrictEqual(inspect(parser('(1)'), ctx), undefined);
33
- assert.deepStrictEqual(inspect(parser('(1)\n'), ctx), undefined);
34
- assert.deepStrictEqual(inspect(parser('(1)\n(1) a'), ctx), undefined);
35
- assert.deepStrictEqual(inspect(parser('I. '), ctx), undefined);
36
- assert.deepStrictEqual(inspect(parser('A. '), ctx), undefined);
37
- assert.deepStrictEqual(inspect(parser('(I) '), ctx), undefined);
38
- assert.deepStrictEqual(inspect(parser('(A) '), ctx), undefined);
39
- assert.deepStrictEqual(inspect(parser(' 1. '), 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('1a. ', new Context())), undefined);
15
+ assert.deepStrictEqual(inspect(parser, input('a1. ', new Context())), undefined);
16
+ assert.deepStrictEqual(inspect(parser, input('aZ. ', new Context())), undefined);
17
+ assert.deepStrictEqual(inspect(parser, input('Az. ', new Context())), undefined);
18
+ assert.deepStrictEqual(inspect(parser, input('1', new Context())), undefined);
19
+ assert.deepStrictEqual(inspect(parser, input('1 ', new Context())), undefined);
20
+ assert.deepStrictEqual(inspect(parser, input('1\n', new Context())), undefined);
21
+ assert.deepStrictEqual(inspect(parser, input('1.', new Context())), undefined);
22
+ assert.deepStrictEqual(inspect(parser, input('1.a', new Context())), undefined);
23
+ assert.deepStrictEqual(inspect(parser, input('1', new Context())), undefined);
24
+ assert.deepStrictEqual(inspect(parser, input('1 ', new Context())), undefined);
25
+ assert.deepStrictEqual(inspect(parser, input('1\n', new Context())), undefined);
26
+ assert.deepStrictEqual(inspect(parser, input('1.', new Context())), undefined);
27
+ assert.deepStrictEqual(inspect(parser, input('1.1', new Context())), undefined);
28
+ assert.deepStrictEqual(inspect(parser, input('1.1.', new Context())), undefined);
29
+ assert.deepStrictEqual(inspect(parser, input('1.a', new Context())), undefined);
30
+ assert.deepStrictEqual(inspect(parser, input('1.\n', new Context())), undefined);
31
+ assert.deepStrictEqual(inspect(parser, input('1.\n1. a', new Context())), undefined);
32
+ assert.deepStrictEqual(inspect(parser, input('(1)', new Context())), undefined);
33
+ assert.deepStrictEqual(inspect(parser, input('(1)\n', new Context())), undefined);
34
+ assert.deepStrictEqual(inspect(parser, input('(1)\n(1) a', new Context())), undefined);
35
+ assert.deepStrictEqual(inspect(parser, input('I. ', new Context())), undefined);
36
+ assert.deepStrictEqual(inspect(parser, input('A. ', new Context())), undefined);
37
+ assert.deepStrictEqual(inspect(parser, input('(I) ', new Context())), undefined);
38
+ assert.deepStrictEqual(inspect(parser, input('(A) ', new Context())), undefined);
39
+ assert.deepStrictEqual(inspect(parser, input(' 1. ', new Context())), undefined);
40
40
  });
41
41
 
42
42
  it('single', () => {
43
43
  // pending
44
- assert.deepStrictEqual(inspect(parser('1. '), ctx), [['<ol><li></li></ol>'], '']);
44
+ assert.deepStrictEqual(inspect(parser, input('1. ', new Context())), [['<ol><li></li></ol>'], '']);
45
45
  // filled
46
- assert.deepStrictEqual(inspect(parser('1. \\'), ctx), [['<ol><li id="index::\\">\\</li></ol>'], '']);
47
- assert.deepStrictEqual(inspect(parser('1. \\\n'), ctx), [['<ol><li id="index::\\">\\</li></ol>'], '']);
48
- assert.deepStrictEqual(inspect(parser('1. -'), ctx), [['<ol><li id="index::-">-</li></ol>'], '']);
49
- assert.deepStrictEqual(inspect(parser('1. -\n'), ctx), [['<ol><li id="index::-">-</li></ol>'], '']);
46
+ assert.deepStrictEqual(inspect(parser, input('1. \\', new Context())), [['<ol><li id="index::\\">\\</li></ol>'], '']);
47
+ assert.deepStrictEqual(inspect(parser, input('1. \\\n', new Context())), [['<ol><li id="index::\\">\\</li></ol>'], '']);
48
+ assert.deepStrictEqual(inspect(parser, input('1. -', new Context())), [['<ol><li id="index::-">-</li></ol>'], '']);
49
+ assert.deepStrictEqual(inspect(parser, input('1. -\n', new Context())), [['<ol><li id="index::-">-</li></ol>'], '']);
50
50
  // pending
51
- assert.deepStrictEqual(inspect(parser('(1) '), ctx), [['<ol data-format="paren"><li></li></ol>'], '']);
51
+ assert.deepStrictEqual(inspect(parser, input('(1) ', new Context())), [['<ol data-format="paren"><li></li></ol>'], '']);
52
52
  // filled
53
- assert.deepStrictEqual(inspect(parser('(1) a'), ctx), [['<ol data-format="paren"><li id="index::a">a</li></ol>'], '']);
53
+ assert.deepStrictEqual(inspect(parser, input('(1) a', new Context())), [['<ol data-format="paren"><li id="index::a">a</li></ol>'], '']);
54
54
  });
55
55
 
56
56
  it('multiple', () => {
57
57
  // pending
58
- assert.deepStrictEqual(inspect(parser('0. \n0'), ctx), [['<ol><li></li><li></li></ol>'], '']);
59
- assert.deepStrictEqual(inspect(parser('0. \n0\n'), ctx), [['<ol><li></li><li></li></ol>'], '']);
60
- assert.deepStrictEqual(inspect(parser('0. \n0.'), ctx), [['<ol><li></li><li></li></ol>'], '']);
61
- assert.deepStrictEqual(inspect(parser('0. \n0. '), ctx), [['<ol><li></li><li></li></ol>'], '']);
62
- assert.deepStrictEqual(inspect(parser('0. \n0.\n'), ctx), [['<ol><li></li><li></li></ol>'], '']);
58
+ assert.deepStrictEqual(inspect(parser, input('0. \n0', new Context())), [['<ol><li></li><li></li></ol>'], '']);
59
+ assert.deepStrictEqual(inspect(parser, input('0. \n0\n', new Context())), [['<ol><li></li><li></li></ol>'], '']);
60
+ assert.deepStrictEqual(inspect(parser, input('0. \n0.', new Context())), [['<ol><li></li><li></li></ol>'], '']);
61
+ assert.deepStrictEqual(inspect(parser, input('0. \n0. ', new Context())), [['<ol><li></li><li></li></ol>'], '']);
62
+ assert.deepStrictEqual(inspect(parser, input('0. \n0.\n', new Context())), [['<ol><li></li><li></li></ol>'], '']);
63
63
  // filled
64
- assert.deepStrictEqual(inspect(parser('0. 1\n0. 2'), ctx), [['<ol><li id="index::1">1</li><li id="index::2">2</li></ol>'], '']);
65
- assert.deepStrictEqual(inspect(parser('0. 1\n0. 2\n0. 3'), ctx), [['<ol><li id="index::1">1</li><li id="index::2">2</li><li id="index::3">3</li></ol>'], '']);
64
+ assert.deepStrictEqual(inspect(parser, input('0. 1\n0. 2', new Context())), [['<ol><li id="index::1">1</li><li id="index::2">2</li></ol>'], '']);
65
+ assert.deepStrictEqual(inspect(parser, input('0. 1\n0. 2\n0. 3', new Context())), [['<ol><li id="index::1">1</li><li id="index::2">2</li><li id="index::3">3</li></ol>'], '']);
66
66
  // pending
67
- assert.deepStrictEqual(inspect(parser('(1) \n('), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
68
- assert.deepStrictEqual(inspect(parser('(1) \n(\n'), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
69
- assert.deepStrictEqual(inspect(parser('(1) \n(1'), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
70
- assert.deepStrictEqual(inspect(parser('(1) \n(1\n'), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
71
- assert.deepStrictEqual(inspect(parser('(1) \n(1)'), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
72
- assert.deepStrictEqual(inspect(parser('(1) \n(1)\n'), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
67
+ assert.deepStrictEqual(inspect(parser, input('(1) \n(', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
68
+ assert.deepStrictEqual(inspect(parser, input('(1) \n(\n', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
69
+ assert.deepStrictEqual(inspect(parser, input('(1) \n(1', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
70
+ assert.deepStrictEqual(inspect(parser, input('(1) \n(1\n', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
71
+ assert.deepStrictEqual(inspect(parser, input('(1) \n(1)', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
72
+ assert.deepStrictEqual(inspect(parser, input('(1) \n(1)\n', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
73
73
  // filled
74
- assert.deepStrictEqual(inspect(parser('(1) \n(1) '), ctx), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
74
+ assert.deepStrictEqual(inspect(parser, input('(1) \n(1) ', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
75
75
  // invalid
76
- assert.deepStrictEqual(inspect(parser('0. \n0 '), ctx), [['<ol><li></li><li id="index::0"><span class="invalid">0 </span></li></ol>'], '']);
76
+ assert.deepStrictEqual(inspect(parser, input('0. \n0 ', new Context())), [['<ol><li></li><li id="index::0"><span class="invalid">0 </span></li></ol>'], '']);
77
77
  });
78
78
 
79
79
  it('nest', () => {
80
- assert.deepStrictEqual(inspect(parser('0. \n 0'), ctx), [['<ol><li><br><ol><li></li></ol></li></ol>'], '']);
81
- assert.deepStrictEqual(inspect(parser('0. 1\n 0'), ctx), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
82
- assert.deepStrictEqual(inspect(parser('0. 1\n 0.'), ctx), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
83
- assert.deepStrictEqual(inspect(parser('0. 1\n 0. '), ctx), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
84
- assert.deepStrictEqual(inspect(parser('0. 1\n 0.\n'), ctx), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
85
- assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2'), ctx), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li></ol>'], '']);
86
- assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n0. 3'), ctx), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::3">3</li></ol>'], '']);
87
- assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3'), ctx), [['<ol><li id="index::1">1<ol><li id="index::2">2</li><li id="index::3">3</li></ol></li></ol>'], '']);
88
- assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3'), ctx), [['<ol><li id="index::1">1<ol><li id="index::2">2<ol><li id="index::3">3</li></ol></li></ol></li></ol>'], '']);
89
- assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3'), ctx), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::0._3"><span class="invalid"> 0. 3</span></li></ol>'], '']);
90
- assert.deepStrictEqual(inspect(parser('0. a [#b]'), ctx), [['<ol><li id="index::a_b">a <a class="index" href="#index::b">b</a></li></ol>'], '']);
91
- assert.deepStrictEqual(inspect(parser('0. http://host\\'), ctx), [['<ol><li id="index::http://host\\"><a class="url" href="http://host\\" target="_blank">http://host\\</a></li></ol>'], '']);
92
- assert.deepStrictEqual(inspect(parser('0. !http://host'), ctx), [['<ol><li id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></li></ol>'], '']);
80
+ assert.deepStrictEqual(inspect(parser, input('0. \n 0', new Context())), [['<ol><li><br><ol><li></li></ol></li></ol>'], '']);
81
+ assert.deepStrictEqual(inspect(parser, input('0. 1\n 0', new Context())), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
82
+ assert.deepStrictEqual(inspect(parser, input('0. 1\n 0.', new Context())), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
83
+ assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. ', new Context())), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
84
+ assert.deepStrictEqual(inspect(parser, input('0. 1\n 0.\n', new Context())), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
85
+ assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2', new Context())), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li></ol>'], '']);
86
+ assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2\n0. 3', new Context())), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::3">3</li></ol>'], '']);
87
+ assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2\n 0. 3', new Context())), [['<ol><li id="index::1">1<ol><li id="index::2">2</li><li id="index::3">3</li></ol></li></ol>'], '']);
88
+ assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2\n 0. 3', new Context())), [['<ol><li id="index::1">1<ol><li id="index::2">2<ol><li id="index::3">3</li></ol></li></ol></li></ol>'], '']);
89
+ assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2\n 0. 3', new Context())), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::0._3"><span class="invalid"> 0. 3</span></li></ol>'], '']);
90
+ assert.deepStrictEqual(inspect(parser, input('0. a [#b]', new Context())), [['<ol><li id="index::a_b">a <a class="index" href="#index::b">b</a></li></ol>'], '']);
91
+ assert.deepStrictEqual(inspect(parser, input('0. http://host\\', new Context())), [['<ol><li id="index::http://host\\"><a class="url" href="http://host\\" target="_blank">http://host\\</a></li></ol>'], '']);
92
+ assert.deepStrictEqual(inspect(parser, input('0. !http://host', new Context())), [['<ol><li id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></li></ol>'], '']);
93
93
  });
94
94
 
95
95
  it('index', () => {
96
- assert.deepStrictEqual(inspect(parser('1. '), ctx), [['<ol><li></li></ol>'], '']);
97
- assert.deepStrictEqual(inspect(parser('9. '), ctx), [['<ol><li data-marker="9."></li></ol>'], '']);
98
- assert.deepStrictEqual(inspect(parser('00. '), ctx), [['<ol><li data-marker="00."></li></ol>'], '']);
99
- assert.deepStrictEqual(inspect(parser('01. '), ctx), [['<ol><li data-marker="01."></li></ol>'], '']);
100
- assert.deepStrictEqual(inspect(parser('0. \n1'), ctx), [['<ol><li></li><li data-marker="1."></li></ol>'], '']);
101
- assert.deepStrictEqual(inspect(parser('8. \n9'), ctx), [['<ol><li data-marker="8."></li><li data-marker="9."></li></ol>'], '']);
102
- assert.deepStrictEqual(inspect(parser('9. \n9'), ctx), [['<ol><li data-marker="9."></li><li data-marker="9." class="invalid"></li></ol>'], '']);
96
+ assert.deepStrictEqual(inspect(parser, input('1. ', new Context())), [['<ol><li></li></ol>'], '']);
97
+ assert.deepStrictEqual(inspect(parser, input('9. ', new Context())), [['<ol><li data-marker="9."></li></ol>'], '']);
98
+ assert.deepStrictEqual(inspect(parser, input('00. ', new Context())), [['<ol><li data-marker="00."></li></ol>'], '']);
99
+ assert.deepStrictEqual(inspect(parser, input('01. ', new Context())), [['<ol><li data-marker="01."></li></ol>'], '']);
100
+ assert.deepStrictEqual(inspect(parser, input('0. \n1', new Context())), [['<ol><li></li><li data-marker="1."></li></ol>'], '']);
101
+ assert.deepStrictEqual(inspect(parser, input('8. \n9', new Context())), [['<ol><li data-marker="8."></li><li data-marker="9."></li></ol>'], '']);
102
+ assert.deepStrictEqual(inspect(parser, input('9. \n9', new Context())), [['<ol><li data-marker="9."></li><li data-marker="9." class="invalid"></li></ol>'], '']);
103
103
  });
104
104
 
105
105
  it('branch', () => {
106
- assert.deepStrictEqual(inspect(parser('1-1. '), ctx), [['<ol><li data-marker="1-1."></li></ol>'], '']);
107
- assert.deepStrictEqual(inspect(parser('1-1-1. '), ctx), [['<ol><li data-marker="1-1-1."></li></ol>'], '']);
108
- assert.deepStrictEqual(inspect(parser('1. \n1-'), ctx), [['<ol><li></li><li data-marker="1-."></li></ol>'], '']);
109
- assert.deepStrictEqual(inspect(parser('1. \n1-1'), ctx), [['<ol><li></li><li data-marker="1-1."></li></ol>'], '']);
110
- assert.deepStrictEqual(inspect(parser('(1)-1 '), ctx), [['<ol data-format="paren"><li data-marker="(1)-1"></li></ol>'], '']);
111
- assert.deepStrictEqual(inspect(parser('(1)-1-1 '), ctx), [['<ol data-format="paren"><li data-marker="(1)-1-1"></li></ol>'], '']);
112
- assert.deepStrictEqual(inspect(parser('(1) \n(1)-'), ctx), [['<ol data-format="paren"><li></li><li data-marker="(1)-"></li></ol>'], '']);
113
- assert.deepStrictEqual(inspect(parser('(1) \n(1)-1'), ctx), [['<ol data-format="paren"><li></li><li data-marker="(1)-1"></li></ol>'], '']);
114
- assert.deepStrictEqual(inspect(parser('1. \n1--'), ctx), [['<ol><li></li><li id="index::1--"><span class="invalid">1--</span></li></ol>'], '']);
115
- assert.deepStrictEqual(inspect(parser('1. \n1--. '), ctx), [['<ol><li></li><li id="index::1--."><span class="invalid">1--. </span></li></ol>'], '']);
116
- assert.deepStrictEqual(inspect(parser('(1) \n(1)--'), ctx), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)--</span></li></ol>'], '']);
117
- assert.deepStrictEqual(inspect(parser('(1) \n(1)-- '), ctx), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)-- </span></li></ol>'], '']);
118
- assert.deepStrictEqual(inspect(parser('1-1. 1'), ctx), [['<ol><li data-marker="1-1." id="index::1">1</li></ol>'], '']);
106
+ assert.deepStrictEqual(inspect(parser, input('1-1. ', new Context())), [['<ol><li data-marker="1-1."></li></ol>'], '']);
107
+ assert.deepStrictEqual(inspect(parser, input('1-1-1. ', new Context())), [['<ol><li data-marker="1-1-1."></li></ol>'], '']);
108
+ assert.deepStrictEqual(inspect(parser, input('1. \n1-', new Context())), [['<ol><li></li><li data-marker="1-."></li></ol>'], '']);
109
+ assert.deepStrictEqual(inspect(parser, input('1. \n1-1', new Context())), [['<ol><li></li><li data-marker="1-1."></li></ol>'], '']);
110
+ assert.deepStrictEqual(inspect(parser, input('(1)-1 ', new Context())), [['<ol data-format="paren"><li data-marker="(1)-1"></li></ol>'], '']);
111
+ assert.deepStrictEqual(inspect(parser, input('(1)-1-1 ', new Context())), [['<ol data-format="paren"><li data-marker="(1)-1-1"></li></ol>'], '']);
112
+ assert.deepStrictEqual(inspect(parser, input('(1) \n(1)-', new Context())), [['<ol data-format="paren"><li></li><li data-marker="(1)-"></li></ol>'], '']);
113
+ assert.deepStrictEqual(inspect(parser, input('(1) \n(1)-1', new Context())), [['<ol data-format="paren"><li></li><li data-marker="(1)-1"></li></ol>'], '']);
114
+ assert.deepStrictEqual(inspect(parser, input('1. \n1--', new Context())), [['<ol><li></li><li id="index::1--"><span class="invalid">1--</span></li></ol>'], '']);
115
+ assert.deepStrictEqual(inspect(parser, input('1. \n1--. ', new Context())), [['<ol><li></li><li id="index::1--."><span class="invalid">1--. </span></li></ol>'], '']);
116
+ assert.deepStrictEqual(inspect(parser, input('(1) \n(1)--', new Context())), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)--</span></li></ol>'], '']);
117
+ assert.deepStrictEqual(inspect(parser, input('(1) \n(1)-- ', new Context())), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)-- </span></li></ol>'], '']);
118
+ assert.deepStrictEqual(inspect(parser, input('1-1. 1', new Context())), [['<ol><li data-marker="1-1." id="index::1">1</li></ol>'], '']);
119
119
  });
120
120
 
121
121
  it('type', () => {
122
- assert.deepStrictEqual(inspect(parser('1. \n i. '), ctx), [['<ol><li><br><ol type="i" data-type="lower-roman"><li></li></ol></li></ol>'], '']);
123
- assert.deepStrictEqual(inspect(parser('1. \n a. '), ctx), [['<ol><li><br><ol type="a" data-type="lower-alpha"><li></li></ol></li></ol>'], '']);
124
- assert.deepStrictEqual(inspect(parser('1. \n I. '), ctx), [['<ol><li><br><ol type="I" data-type="upper-roman"><li></li></ol></li></ol>'], '']);
125
- assert.deepStrictEqual(inspect(parser('1. \n A. '), ctx), [['<ol><li><br><ol type="A" data-type="upper-alpha"><li></li></ol></li></ol>'], '']);
126
- assert.deepStrictEqual(inspect(parser('1. \n a. \n 1.\n c'), ctx), [['<ol><li><br><ol type="a" data-type="lower-alpha"><li></li><li data-marker="1."></li><li data-marker="c."></li></ol></li></ol>'], '']);
127
- assert.deepStrictEqual(inspect(parser('1. \n i. 1'), ctx), [['<ol><li><br><ol type="i" data-type="lower-roman"><li id="index::1">1</li></ol></li></ol>'], '']);
122
+ assert.deepStrictEqual(inspect(parser, input('1. \n i. ', new Context())), [['<ol><li><br><ol type="i" data-type="lower-roman"><li></li></ol></li></ol>'], '']);
123
+ assert.deepStrictEqual(inspect(parser, input('1. \n a. ', new Context())), [['<ol><li><br><ol type="a" data-type="lower-alpha"><li></li></ol></li></ol>'], '']);
124
+ assert.deepStrictEqual(inspect(parser, input('1. \n I. ', new Context())), [['<ol><li><br><ol type="I" data-type="upper-roman"><li></li></ol></li></ol>'], '']);
125
+ assert.deepStrictEqual(inspect(parser, input('1. \n A. ', new Context())), [['<ol><li><br><ol type="A" data-type="upper-alpha"><li></li></ol></li></ol>'], '']);
126
+ assert.deepStrictEqual(inspect(parser, input('1. \n a. \n 1.\n c', new Context())), [['<ol><li><br><ol type="a" data-type="lower-alpha"><li></li><li data-marker="1."></li><li data-marker="c."></li></ol></li></ol>'], '']);
127
+ assert.deepStrictEqual(inspect(parser, input('1. \n i. 1', new Context())), [['<ol><li><br><ol type="i" data-type="lower-roman"><li id="index::1">1</li></ol></li></ol>'], '']);
128
128
  });
129
129
 
130
130
  it('checkbox', () => {
131
- assert.deepStrictEqual(inspect(parser('1. [ ]'), ctx), [['<ol class="checklist"><li><span class="checkbox">☐</span></li></ol>'], '']);
132
- assert.deepStrictEqual(inspect(parser('1. [x]'), ctx), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
133
- assert.deepStrictEqual(inspect(parser('1. [X]'), ctx), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
134
- assert.deepStrictEqual(inspect(parser('1. [X] 1'), ctx), [['<ol class="checklist"><li id="index::1"><span class="checkbox">☑</span>1</li></ol>'], '']);
131
+ assert.deepStrictEqual(inspect(parser, input('1. [ ]', new Context())), [['<ol class="checklist"><li><span class="checkbox">☐</span></li></ol>'], '']);
132
+ assert.deepStrictEqual(inspect(parser, input('1. [x]', new Context())), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
133
+ assert.deepStrictEqual(inspect(parser, input('1. [X]', new Context())), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
134
+ assert.deepStrictEqual(inspect(parser, input('1. [X] 1', new Context())), [['<ol class="checklist"><li id="index::1"><span class="checkbox">☑</span>1</li></ol>'], '']);
135
135
  });
136
136
 
137
137
  it('indexer', () => {
138
- assert.deepStrictEqual(inspect(parser('1. [|a]'), ctx), [['<ol><li id="index::[|a]"><span class="invalid">[|a]</span></li></ol>'], '']);
139
- assert.deepStrictEqual(inspect(parser('1. a [|]'), ctx), [['<ol><li>a<span class="indexer" data-index=""></span></li></ol>'], '']);
140
- assert.deepStrictEqual(inspect(parser('1. a [|b]'), ctx), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span></li></ol>'], '']);
141
- assert.deepStrictEqual(inspect(parser('1. - [|]'), ctx), [['<ol><li>-<span class="indexer" data-index=""></span></li></ol>'], '']);
142
- assert.deepStrictEqual(inspect(parser('1. [ ] [|a]'), ctx), [['<ol class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span><span class="invalid">[|a]</span></li></ol>'], '']);
143
- assert.deepStrictEqual(inspect(parser('1. [ ] a [|b]'), ctx), [['<ol class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ol>'], '']);
144
- assert.deepStrictEqual(inspect(parser('1. a [|]\n 1. c [|d]'), ctx), [['<ol><li>a<span class="indexer" data-index=""></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
145
- assert.deepStrictEqual(inspect(parser('1. a [|b]\n 1. c [|d]'), ctx), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
138
+ assert.deepStrictEqual(inspect(parser, input('1. [|a]', new Context())), [['<ol><li id="index::[|a]"><span class="invalid">[|a]</span></li></ol>'], '']);
139
+ assert.deepStrictEqual(inspect(parser, input('1. a [|]', new Context())), [['<ol><li>a<span class="indexer" data-index=""></span></li></ol>'], '']);
140
+ assert.deepStrictEqual(inspect(parser, input('1. a [|b]', new Context())), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span></li></ol>'], '']);
141
+ assert.deepStrictEqual(inspect(parser, input('1. - [|]', new Context())), [['<ol><li>-<span class="indexer" data-index=""></span></li></ol>'], '']);
142
+ assert.deepStrictEqual(inspect(parser, input('1. [ ] [|a]', new Context())), [['<ol class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span><span class="invalid">[|a]</span></li></ol>'], '']);
143
+ assert.deepStrictEqual(inspect(parser, input('1. [ ] a [|b]', new Context())), [['<ol class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ol>'], '']);
144
+ assert.deepStrictEqual(inspect(parser, input('1. a [|]\n 1. c [|d]', new Context())), [['<ol><li>a<span class="indexer" data-index=""></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
145
+ assert.deepStrictEqual(inspect(parser, input('1. a [|b]\n 1. c [|d]', new Context())), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
146
146
  });
147
147
 
148
148
  });
@@ -1,6 +1,6 @@
1
1
  import { OListParser } 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, inits, subsequence, some, recursion, block, line, validate, indent, focus, open, match, fallback, lazy, fmap } from '../../combinator';
5
5
  import { ulist_, checkbox, fillFirstLine } from './ulist';
6
6
  import { ilist_, ilistitem } from './ilist';
@@ -42,24 +42,24 @@ const list = (type: string, form: string): OListParser.ListParser => fmap(
42
42
  ]),
43
43
  ilistitem),
44
44
  ns => new List([
45
- new Data(html('li', {
45
+ new Node(html('li', {
46
46
  'data-index': dataindex(ns),
47
47
  'data-marker': ns.shift()?.value as string || undefined,
48
48
  }, defrag(unwrap(fillFirstLine(ns)))))
49
49
  ]))),
50
50
  ]))),
51
- ns => new List([new Data(format(html('ol', unwrap(ns)), type, form))]));
51
+ ns => new List([new Node(format(html('ol', unwrap(ns)), type, form))]));
52
52
 
53
53
  const heads = {
54
54
  '.': focus(
55
55
  openers['.'],
56
56
  ({ context: { source } }) => new List([
57
- new Data(source.trimEnd().split('.', 1)[0] + '.')
57
+ new Node(source.trimEnd().split('.', 1)[0] + '.')
58
58
  ])),
59
59
  '(': focus(
60
60
  openers['('],
61
61
  ({ context: { source } }) => new List([
62
- new Data(source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)'))
62
+ new Node(source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)'))
63
63
  ])),
64
64
  } as const;
65
65
 
@@ -1,31 +1,31 @@
1
1
  import { pagebreak } from './pagebreak';
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/pagebreak', () => {
7
8
  describe('pagebreak', () => {
8
- const parser = (source: string) => some(pagebreak)(input(source, ctx));
9
- const { context: ctx } = input('', {});
9
+ const parser = some(pagebreak);
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('=='), ctx), undefined);
16
- assert.deepStrictEqual(inspect(parser('==\n='), ctx), undefined);
17
- assert.deepStrictEqual(inspect(parser('===a'), ctx), undefined);
18
- assert.deepStrictEqual(inspect(parser('===\na'), ctx), undefined);
19
- assert.deepStrictEqual(inspect(parser('= = ='), ctx), undefined);
20
- assert.deepStrictEqual(inspect(parser(' ==='), ctx), undefined);
21
- 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('==', new Context())), undefined);
16
+ assert.deepStrictEqual(inspect(parser, input('==\n=', new Context())), undefined);
17
+ assert.deepStrictEqual(inspect(parser, input('===a', new Context())), undefined);
18
+ assert.deepStrictEqual(inspect(parser, input('===\na', new Context())), undefined);
19
+ assert.deepStrictEqual(inspect(parser, input('= = =', new Context())), undefined);
20
+ assert.deepStrictEqual(inspect(parser, input(' ===', new Context())), undefined);
21
+ assert.deepStrictEqual(inspect(parser, input('---', new Context())), undefined);
22
22
  });
23
23
 
24
24
  it('valid', () => {
25
- assert.deepStrictEqual(inspect(parser('==='), ctx), [['<hr>'], '']);
26
- assert.deepStrictEqual(inspect(parser('=== '), ctx), [['<hr>'], '']);
27
- assert.deepStrictEqual(inspect(parser('===\n'), ctx), [['<hr>'], '']);
28
- assert.deepStrictEqual(inspect(parser('===='), ctx), [['<hr>'], '']);
25
+ assert.deepStrictEqual(inspect(parser, input('===', new Context())), [['<hr>'], '']);
26
+ assert.deepStrictEqual(inspect(parser, input('=== ', new Context())), [['<hr>'], '']);
27
+ assert.deepStrictEqual(inspect(parser, input('===\n', new Context())), [['<hr>'], '']);
28
+ assert.deepStrictEqual(inspect(parser, input('====', new Context())), [['<hr>'], '']);
29
29
  });
30
30
 
31
31
  });
@@ -1,8 +1,8 @@
1
1
  import { PagebreakParser } from '../block';
2
- import { List, Data } from '../../combinator/data/parser';
2
+ import { List, Node } from '../../combinator/data/parser';
3
3
  import { block, line, focus } from '../../combinator';
4
4
  import { html } from 'typed-dom/dom';
5
5
 
6
6
  export const pagebreak: PagebreakParser = block(line(focus(
7
7
  /={3,}[^\S\n]*(?:$|\n)/y,
8
- () => new List([new Data(html('hr'))]))));
8
+ () => new List([new Node(html('hr'))]))));
@@ -1,79 +1,79 @@
1
1
  import { paragraph } from './paragraph';
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/paragraph', () => {
7
8
  describe('paragraph', () => {
8
- const parser = (source: string) => some(paragraph)(input(source, ctx));
9
- const { context: ctx } = input('', {});
9
+ const parser = some(paragraph);
10
10
 
11
11
  it('basic', () => {
12
- assert.deepStrictEqual(inspect(parser('a'), ctx), [['<p>a</p>'], '']);
13
- assert.deepStrictEqual(inspect(parser('ab'), ctx), [['<p>ab</p>'], '']);
14
- assert.deepStrictEqual(inspect(parser('a\\'), ctx), [['<p>a</p>'], '']);
15
- assert.deepStrictEqual(inspect(parser('a '), ctx), [['<p>a</p>'], '']);
16
- assert.deepStrictEqual(inspect(parser('a \n'), ctx), [['<p>a</p>'], '']);
17
- assert.deepStrictEqual(inspect(parser('a\n'), ctx), [['<p>a</p>'], '']);
18
- assert.deepStrictEqual(inspect(parser('a\nb'), ctx), [['<p>a<br>b</p>'], '']);
19
- assert.deepStrictEqual(inspect(parser('a\n\\'), ctx), [['<p>a<br>\\</p>'], '']);
20
- assert.deepStrictEqual(inspect(parser('a\n\\\n'), ctx), [['<p>a<br>\\</p>'], '']);
21
- assert.deepStrictEqual(inspect(parser('a\\ '), ctx), [['<p>a</p>'], '']);
22
- assert.deepStrictEqual(inspect(parser('a\\ \n'), ctx), [['<p>a</p>'], '']);
23
- assert.deepStrictEqual(inspect(parser('a\\\n'), ctx), [['<p>a</p>'], '']);
24
- assert.deepStrictEqual(inspect(parser('a\\\nb'), ctx), [['<p>a<br>b</p>'], '']);
25
- assert.deepStrictEqual(inspect(parser('a&NewLine;b'), ctx), [['<p>a b</p>'], '']);
26
- assert.deepStrictEqual(inspect(parser('&Tab;&NewLine;'), ctx), [['<p>&amp;Tab;</p>'], '']);
27
- assert.deepStrictEqual(inspect(parser('<wbr>'), ctx), [['<p>&lt;wbr&gt;</p>'], '']);
28
- assert.deepStrictEqual(inspect(parser('<wbr>\n'), ctx), [['<p>&lt;wbr&gt;</p>'], '']);
29
- assert.deepStrictEqual(inspect(parser('<wbr>\na'), ctx), [['<p>&lt;wbr&gt;<br>a</p>'], '']);
30
- assert.deepStrictEqual(inspect(parser('a\n<wbr>\n'), ctx), [['<p>a<br>&lt;wbr&gt;</p>'], '']);
31
- assert.deepStrictEqual(inspect(parser('a\n<wbr>\nb'), ctx), [['<p>a<br>&lt;wbr&gt;<br>b</p>'], '']);
32
- assert.deepStrictEqual(inspect(parser('*a\n<wbr>*\nb'), ctx), [['<p>*a<br><wbr>*<br>b</p>'], '']);
33
- assert.deepStrictEqual(inspect(parser('**a\n<wbr>**\nb'), ctx), [['<p>**a<br><wbr>**<br>b</p>'], '']);
34
- assert.deepStrictEqual(inspect(parser('***a\n<wbr>***\nb'), ctx), [['<p>***a<br><wbr>***<br>b</p>'], '']);
35
- assert.deepStrictEqual(inspect(parser('***a*b\n<wbr>**\nc'), ctx), [['<p>**<em>a</em>b<br><wbr>**<br>c</p>'], '']);
36
- assert.deepStrictEqual(inspect(parser('***a**b\n<wbr>*\nc'), ctx), [['<p>*<strong>a</strong>b<br><wbr>*<br>c</p>'], '']);
37
- assert.deepStrictEqual(inspect(parser('==a\n<wbr>==\nb'), ctx), [['<p>==a<br><wbr>==<br>b</p>'], '']);
38
- assert.deepStrictEqual(inspect(parser('http://host)'), ctx), [['<p><a class="url" href="http://host)" target="_blank">http://host)</a></p>'], '']);
39
- assert.deepStrictEqual(inspect(parser('a\nhttp://host) \nb'), ctx), [['<p>a<br><a class="url" href="http://host)" target="_blank">http://host)</a><br>b</p>'], '']);
40
- assert.deepStrictEqual(inspect(parser('!http://host)'), ctx), [['<p>!<a class="url" href="http://host)" target="_blank">http://host)</a></p>'], '']);
41
- assert.deepStrictEqual(inspect(parser('a\n!http://host) \nb'), ctx), [['<p>a<br>!<a class="url" href="http://host)" target="_blank">http://host)</a><br>b</p>'], '']);
42
- assert.deepStrictEqual(inspect(parser('\ta'), ctx), [['<p>\ta</p>'], '']);
43
- assert.deepStrictEqual(inspect(parser('[[^A]]'), ctx), [['<p><sup class="reference" data-abbr="A"><span></span></sup></p>'], '']);
12
+ assert.deepStrictEqual(inspect(parser, input('a', new Context())), [['<p>a</p>'], '']);
13
+ assert.deepStrictEqual(inspect(parser, input('ab', new Context())), [['<p>ab</p>'], '']);
14
+ assert.deepStrictEqual(inspect(parser, input('a\\', new Context())), [['<p>a</p>'], '']);
15
+ assert.deepStrictEqual(inspect(parser, input('a ', new Context())), [['<p>a</p>'], '']);
16
+ assert.deepStrictEqual(inspect(parser, input('a \n', new Context())), [['<p>a</p>'], '']);
17
+ assert.deepStrictEqual(inspect(parser, input('a\n', new Context())), [['<p>a</p>'], '']);
18
+ assert.deepStrictEqual(inspect(parser, input('a\nb', new Context())), [['<p>a<br>b</p>'], '']);
19
+ assert.deepStrictEqual(inspect(parser, input('a\n\\', new Context())), [['<p>a<br>\\</p>'], '']);
20
+ assert.deepStrictEqual(inspect(parser, input('a\n\\\n', new Context())), [['<p>a<br>\\</p>'], '']);
21
+ assert.deepStrictEqual(inspect(parser, input('a\\ ', new Context())), [['<p>a</p>'], '']);
22
+ assert.deepStrictEqual(inspect(parser, input('a\\ \n', new Context())), [['<p>a</p>'], '']);
23
+ assert.deepStrictEqual(inspect(parser, input('a\\\n', new Context())), [['<p>a</p>'], '']);
24
+ assert.deepStrictEqual(inspect(parser, input('a\\\nb', new Context())), [['<p>a<br>b</p>'], '']);
25
+ assert.deepStrictEqual(inspect(parser, input('a&NewLine;b', new Context())), [['<p>a b</p>'], '']);
26
+ assert.deepStrictEqual(inspect(parser, input('&Tab;&NewLine;', new Context())), [['<p>&amp;Tab;</p>'], '']);
27
+ assert.deepStrictEqual(inspect(parser, input('<wbr>', new Context())), [['<p>&lt;wbr&gt;</p>'], '']);
28
+ assert.deepStrictEqual(inspect(parser, input('<wbr>\n', new Context())), [['<p>&lt;wbr&gt;</p>'], '']);
29
+ assert.deepStrictEqual(inspect(parser, input('<wbr>\na', new Context())), [['<p>&lt;wbr&gt;<br>a</p>'], '']);
30
+ assert.deepStrictEqual(inspect(parser, input('a\n<wbr>\n', new Context())), [['<p>a<br>&lt;wbr&gt;</p>'], '']);
31
+ assert.deepStrictEqual(inspect(parser, input('a\n<wbr>\nb', new Context())), [['<p>a<br>&lt;wbr&gt;<br>b</p>'], '']);
32
+ assert.deepStrictEqual(inspect(parser, input('*a\n<wbr>*\nb', new Context())), [['<p>*a<br><wbr>*<br>b</p>'], '']);
33
+ assert.deepStrictEqual(inspect(parser, input('**a\n<wbr>**\nb', new Context())), [['<p>**a<br><wbr>**<br>b</p>'], '']);
34
+ assert.deepStrictEqual(inspect(parser, input('***a\n<wbr>***\nb', new Context())), [['<p>***a<br><wbr>***<br>b</p>'], '']);
35
+ assert.deepStrictEqual(inspect(parser, input('***a*b\n<wbr>**\nc', new Context())), [['<p>**<em>a</em>b<br><wbr>**<br>c</p>'], '']);
36
+ assert.deepStrictEqual(inspect(parser, input('***a**b\n<wbr>*\nc', new Context())), [['<p>*<strong>a</strong>b<br><wbr>*<br>c</p>'], '']);
37
+ assert.deepStrictEqual(inspect(parser, input('==a\n<wbr>==\nb', new Context())), [['<p>==a<br><wbr>==<br>b</p>'], '']);
38
+ assert.deepStrictEqual(inspect(parser, input('http://host)', new Context())), [['<p><a class="url" href="http://host)" target="_blank">http://host)</a></p>'], '']);
39
+ assert.deepStrictEqual(inspect(parser, input('a\nhttp://host) \nb', new Context())), [['<p>a<br><a class="url" href="http://host)" target="_blank">http://host)</a><br>b</p>'], '']);
40
+ assert.deepStrictEqual(inspect(parser, input('!http://host)', new Context())), [['<p>!<a class="url" href="http://host)" target="_blank">http://host)</a></p>'], '']);
41
+ assert.deepStrictEqual(inspect(parser, input('a\n!http://host) \nb', new Context())), [['<p>a<br>!<a class="url" href="http://host)" target="_blank">http://host)</a><br>b</p>'], '']);
42
+ assert.deepStrictEqual(inspect(parser, input('\ta', new Context())), [['<p>\ta</p>'], '']);
43
+ assert.deepStrictEqual(inspect(parser, input('[[^A]]', new Context())), [['<p><sup class="reference" data-abbr="A"><span></span></sup></p>'], '']);
44
44
  });
45
45
 
46
46
  it('anchor', () => {
47
- assert.deepStrictEqual(inspect(parser('>>1 a\nb'), ctx), [['<p><a class="anchor" href="?at=1">&gt;&gt;1</a> a<br>b</p>'], '']);
48
- assert.deepStrictEqual(inspect(parser('>>1 a\n>>2'), ctx), [['<p><a class="anchor" href="?at=1">&gt;&gt;1</a> a<br><a class="anchor" href="?at=2">&gt;&gt;2</a></p>'], '']);
49
- assert.deepStrictEqual(inspect(parser('>>1 a\n>>b'), ctx), [['<p><a class="anchor" href="?at=1">&gt;&gt;1</a> a<br><a class="anchor" href="?at=b">&gt;&gt;b</a></p>'], '']);
50
- assert.deepStrictEqual(inspect(parser('>>1 a\n>> b'), ctx), [['<p><a class="anchor" href="?at=1">&gt;&gt;1</a> a<br>&gt;&gt; b</p>'], '']);
51
- assert.deepStrictEqual(inspect(parser('>>11.'), ctx), [['<p><a class="anchor" href="?at=11">&gt;&gt;11</a>.</p>'], '']);
52
- assert.deepStrictEqual(inspect(parser('>>11 a'), ctx), [['<p><a class="anchor" href="?at=11">&gt;&gt;11</a> a</p>'], '']);
53
- assert.deepStrictEqual(inspect(parser('>>>11 a'), ctx), [['<p>&gt;<a class="anchor" href="?at=11">&gt;&gt;11</a> a</p>'], '']);
54
- assert.deepStrictEqual(inspect(parser('>> a\n>>1'), ctx), [['<p>&gt;&gt; a<br><a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
55
- assert.deepStrictEqual(inspect(parser('a>>1'), ctx), [['<p>a&gt;&gt;1</p>'], '']);
56
- assert.deepStrictEqual(inspect(parser('ab>>1'), ctx), [['<p>ab&gt;&gt;1</p>'], '']);
57
- assert.deepStrictEqual(inspect(parser('a >>1'), ctx), [['<p>a <a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
58
- assert.deepStrictEqual(inspect(parser('a\n>>1'), ctx), [['<p>a<br><a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
59
- assert.deepStrictEqual(inspect(parser('a\n>>1\nb'), ctx), [['<p>a<br><a class="anchor" href="?at=1">&gt;&gt;1</a><br>b</p>'], '']);
60
- assert.deepStrictEqual(inspect(parser('a\n>> b\nc'), ctx), [['<p>a<br>&gt;&gt; b<br>c</p>'], '']);
61
- assert.deepStrictEqual(inspect(parser('\t>>1'), ctx), [['<p>\t<a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
62
- assert.deepStrictEqual(inspect(parser('\t>>>1'), ctx), [['<p>\t&gt;<a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
63
- assert.deepStrictEqual(inspect(parser('あ>>1'), ctx), [['<p>あ<a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
47
+ assert.deepStrictEqual(inspect(parser, input('>>1 a\nb', new Context())), [['<p><a class="anchor" href="?at=1">&gt;&gt;1</a> a<br>b</p>'], '']);
48
+ assert.deepStrictEqual(inspect(parser, input('>>1 a\n>>2', new Context())), [['<p><a class="anchor" href="?at=1">&gt;&gt;1</a> a<br><a class="anchor" href="?at=2">&gt;&gt;2</a></p>'], '']);
49
+ assert.deepStrictEqual(inspect(parser, input('>>1 a\n>>b', new Context())), [['<p><a class="anchor" href="?at=1">&gt;&gt;1</a> a<br><a class="anchor" href="?at=b">&gt;&gt;b</a></p>'], '']);
50
+ assert.deepStrictEqual(inspect(parser, input('>>1 a\n>> b', new Context())), [['<p><a class="anchor" href="?at=1">&gt;&gt;1</a> a<br>&gt;&gt; b</p>'], '']);
51
+ assert.deepStrictEqual(inspect(parser, input('>>11.', new Context())), [['<p><a class="anchor" href="?at=11">&gt;&gt;11</a>.</p>'], '']);
52
+ assert.deepStrictEqual(inspect(parser, input('>>11 a', new Context())), [['<p><a class="anchor" href="?at=11">&gt;&gt;11</a> a</p>'], '']);
53
+ assert.deepStrictEqual(inspect(parser, input('>>>11 a', new Context())), [['<p>&gt;<a class="anchor" href="?at=11">&gt;&gt;11</a> a</p>'], '']);
54
+ assert.deepStrictEqual(inspect(parser, input('>> a\n>>1', new Context())), [['<p>&gt;&gt; a<br><a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
55
+ assert.deepStrictEqual(inspect(parser, input('a>>1', new Context())), [['<p>a&gt;&gt;1</p>'], '']);
56
+ assert.deepStrictEqual(inspect(parser, input('ab>>1', new Context())), [['<p>ab&gt;&gt;1</p>'], '']);
57
+ assert.deepStrictEqual(inspect(parser, input('a >>1', new Context())), [['<p>a <a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
58
+ assert.deepStrictEqual(inspect(parser, input('a\n>>1', new Context())), [['<p>a<br><a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
59
+ assert.deepStrictEqual(inspect(parser, input('a\n>>1\nb', new Context())), [['<p>a<br><a class="anchor" href="?at=1">&gt;&gt;1</a><br>b</p>'], '']);
60
+ assert.deepStrictEqual(inspect(parser, input('a\n>> b\nc', new Context())), [['<p>a<br>&gt;&gt; b<br>c</p>'], '']);
61
+ assert.deepStrictEqual(inspect(parser, input('\t>>1', new Context())), [['<p>\t<a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
62
+ assert.deepStrictEqual(inspect(parser, input('\t>>>1', new Context())), [['<p>\t&gt;<a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
63
+ assert.deepStrictEqual(inspect(parser, input('あ>>1', new Context())), [['<p>あ<a class="anchor" href="?at=1">&gt;&gt;1</a></p>'], '']);
64
64
  });
65
65
 
66
66
  it('remark', () => {
67
- assert.deepStrictEqual(inspect(parser('[% a %]'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span></p>'], '']);
68
- assert.deepStrictEqual(inspect(parser('[% a %]b'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span>b</p>'], '']);
69
- assert.deepStrictEqual(inspect(parser('[% a %]\nb'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span><br>b</p>'], '']);
70
- assert.deepStrictEqual(inspect(parser('[%\n<wbr>\n%]'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[%<br>&lt;wbr&gt;<br>%]</span></span></p>'], '']);
71
- assert.deepStrictEqual(inspect(parser('[%\n<wbr>\n%]a'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[%<br>&lt;wbr&gt;<br>%]</span></span>a</p>'], '']);
72
- assert.deepStrictEqual(inspect(parser('[%\n<wbr>\n%]\na'), ctx), [['<p><span class="remark"><input type="checkbox"><span>[%<br>&lt;wbr&gt;<br>%]</span></span><br>a</p>'], '']);
67
+ assert.deepStrictEqual(inspect(parser, input('[% a %]', new Context())), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span></p>'], '']);
68
+ assert.deepStrictEqual(inspect(parser, input('[% a %]b', new Context())), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span>b</p>'], '']);
69
+ assert.deepStrictEqual(inspect(parser, input('[% a %]\nb', new Context())), [['<p><span class="remark"><input type="checkbox"><span>[% a %]</span></span><br>b</p>'], '']);
70
+ assert.deepStrictEqual(inspect(parser, input('[%\n<wbr>\n%]', new Context())), [['<p><span class="remark"><input type="checkbox"><span>[%<br>&lt;wbr&gt;<br>%]</span></span></p>'], '']);
71
+ assert.deepStrictEqual(inspect(parser, input('[%\n<wbr>\n%]a', new Context())), [['<p><span class="remark"><input type="checkbox"><span>[%<br>&lt;wbr&gt;<br>%]</span></span>a</p>'], '']);
72
+ assert.deepStrictEqual(inspect(parser, input('[%\n<wbr>\n%]\na', new Context())), [['<p><span class="remark"><input type="checkbox"><span>[%<br>&lt;wbr&gt;<br>%]</span></span><br>a</p>'], '']);
73
73
  });
74
74
 
75
75
  it('template', () => {
76
- assert.deepStrictEqual(inspect(parser('{{\n\\\n}}'), ctx), [['<p><span class="template">{{<br>\\<br>}}</span></p>'], '']);
76
+ assert.deepStrictEqual(inspect(parser, input('{{\n\\\n}}', new Context())), [['<p><span class="template">{{<br>\\<br>}}</span></p>'], '']);
77
77
  });
78
78
 
79
79
  });
@@ -1,5 +1,5 @@
1
1
  import { ParagraphParser } from '../block';
2
- import { List, Data } from '../../combinator/data/parser';
2
+ import { List, Node } from '../../combinator/data/parser';
3
3
  import { union, some, block, fmap } from '../../combinator';
4
4
  import { inline } from '../inline';
5
5
  import { visualize, trimBlankEnd } from '../visibility';
@@ -8,4 +8,4 @@ import { html, defrag } from 'typed-dom/dom';
8
8
 
9
9
  export const paragraph: ParagraphParser = block(fmap(
10
10
  visualize(trimBlankEnd(some(union([inline])))),
11
- ns => new List([new Data(html('p', defrag(unwrap(ns))))])));
11
+ ns => new List([new Node(html('p', defrag(unwrap(ns))))])));