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,53 +1,53 @@
1
1
  import { htmlentity } from './htmlentity';
2
2
  import { some } from '../../combinator';
3
3
  import { input } from '../../combinator/data/parser';
4
+ import { Context } from '../context';
4
5
  import { inspect } from '../../debug.test';
5
6
 
6
7
  describe('Unit: parser/inline/htmlentity', () => {
7
8
  describe('htmlentity', () => {
8
- const parser = (source: string) => some(htmlentity)(input(source, ctx));
9
- const { context: ctx } = input('', {});
9
+ const parser = some(htmlentity);
10
10
 
11
11
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
- assert.deepStrictEqual(inspect(parser('&'), ctx), [['&'], '']);
14
- assert.deepStrictEqual(inspect(parser('&amp'), ctx), [['&amp'], '']);
15
- assert.deepStrictEqual(inspect(parser('&;'), ctx), [['&'], ';']);
16
- assert.deepStrictEqual(inspect(parser('& ;'), ctx), [['&'], ' ;']);
17
- assert.deepStrictEqual(inspect(parser('&\n;'), ctx), [['&'], '\n;']);
18
- assert.deepStrictEqual(inspect(parser('&a;'), ctx), [['<span class="invalid">&amp;a;</span>'], '']);
19
- assert.deepStrictEqual(inspect(parser('&#;'), ctx), [['&'], '#;']);
20
- assert.deepStrictEqual(inspect(parser('&#g;'), ctx), [['&'], '#g;']);
21
- assert.deepStrictEqual(inspect(parser('&#x;'), ctx), [['&'], '#x;']);
22
- assert.deepStrictEqual(inspect(parser('&#-1;'), ctx), [['&'], '#-1;']);
23
- assert.deepStrictEqual(inspect(parser('&&amp;;'), ctx), [['&', '&'], ';']);
24
- assert.deepStrictEqual(inspect(parser('&*&amp*'), ctx), [['&'], '*&amp*']);
25
- assert.deepStrictEqual(inspect(parser('&<;'), ctx), [['&'], '<;']);
26
- assert.deepStrictEqual(inspect(parser('&<>;'), ctx), [['&'], '<>;']);
27
- assert.deepStrictEqual(inspect(parser('&>;'), ctx), [['&'], '>;']);
28
- assert.deepStrictEqual(inspect(parser('&#35;'), ctx), [['&'], '#35;']);
29
- assert.deepStrictEqual(inspect(parser('&#1234;'), ctx), [['&'], '#1234;']);
30
- assert.deepStrictEqual(inspect(parser('&#992;'), ctx), [['&'], '#992;']);
31
- assert.deepStrictEqual(inspect(parser('&#98765432;'), ctx), [['&'], '#98765432;']);
32
- assert.deepStrictEqual(inspect(parser('&#0;'), ctx), [['&'], '#0;']);
33
- assert.deepStrictEqual(inspect(parser('&#X22;'), ctx), [['&'], '#X22;']);
34
- assert.deepStrictEqual(inspect(parser('&#XD06;'), ctx), [['&'], '#XD06;']);
35
- assert.deepStrictEqual(inspect(parser('&#xcab;'), ctx), [['&'], '#xcab;']);
36
- assert.deepStrictEqual(inspect(parser(' &amp;'), ctx), undefined);
12
+ assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
13
+ assert.deepStrictEqual(inspect(parser, input('&', new Context())), [['&'], '']);
14
+ assert.deepStrictEqual(inspect(parser, input('&amp', new Context())), [['&amp'], '']);
15
+ assert.deepStrictEqual(inspect(parser, input('&;', new Context())), [['&'], ';']);
16
+ assert.deepStrictEqual(inspect(parser, input('& ;', new Context())), [['&'], ' ;']);
17
+ assert.deepStrictEqual(inspect(parser, input('&\n;', new Context())), [['&'], '\n;']);
18
+ assert.deepStrictEqual(inspect(parser, input('&a;', new Context())), [['<span class="invalid">&amp;a;</span>'], '']);
19
+ assert.deepStrictEqual(inspect(parser, input('&#;', new Context())), [['&'], '#;']);
20
+ assert.deepStrictEqual(inspect(parser, input('&#g;', new Context())), [['&'], '#g;']);
21
+ assert.deepStrictEqual(inspect(parser, input('&#x;', new Context())), [['&'], '#x;']);
22
+ assert.deepStrictEqual(inspect(parser, input('&#-1;', new Context())), [['&'], '#-1;']);
23
+ assert.deepStrictEqual(inspect(parser, input('&&amp;;', new Context())), [['&', '&'], ';']);
24
+ assert.deepStrictEqual(inspect(parser, input('&*&amp*', new Context())), [['&'], '*&amp*']);
25
+ assert.deepStrictEqual(inspect(parser, input('&<;', new Context())), [['&'], '<;']);
26
+ assert.deepStrictEqual(inspect(parser, input('&<>;', new Context())), [['&'], '<>;']);
27
+ assert.deepStrictEqual(inspect(parser, input('&>;', new Context())), [['&'], '>;']);
28
+ assert.deepStrictEqual(inspect(parser, input('&#35;', new Context())), [['&'], '#35;']);
29
+ assert.deepStrictEqual(inspect(parser, input('&#1234;', new Context())), [['&'], '#1234;']);
30
+ assert.deepStrictEqual(inspect(parser, input('&#992;', new Context())), [['&'], '#992;']);
31
+ assert.deepStrictEqual(inspect(parser, input('&#98765432;', new Context())), [['&'], '#98765432;']);
32
+ assert.deepStrictEqual(inspect(parser, input('&#0;', new Context())), [['&'], '#0;']);
33
+ assert.deepStrictEqual(inspect(parser, input('&#X22;', new Context())), [['&'], '#X22;']);
34
+ assert.deepStrictEqual(inspect(parser, input('&#XD06;', new Context())), [['&'], '#XD06;']);
35
+ assert.deepStrictEqual(inspect(parser, input('&#xcab;', new Context())), [['&'], '#xcab;']);
36
+ assert.deepStrictEqual(inspect(parser, input(' &amp;', new Context())), undefined);
37
37
  });
38
38
 
39
39
  it('entity', () => {
40
- assert.deepStrictEqual(inspect(parser('&NewLine;'), ctx), [[' '], '']);
41
- assert.deepStrictEqual(inspect(parser('&nbsp;'), ctx), [['\u00A0'], '']);
42
- assert.deepStrictEqual(inspect(parser('&amp;'), ctx), [['&'], '']);
43
- assert.deepStrictEqual(inspect(parser('&copy;'), ctx), [['©'], '']);
44
- assert.deepStrictEqual(inspect(parser('&AElig;'), ctx), [['Æ'], '']);
45
- assert.deepStrictEqual(inspect(parser('&Dcaron;'), ctx), [['Ď'], '']);
46
- assert.deepStrictEqual(inspect(parser('&frac34;'), ctx), [['¾'], '']);
47
- assert.deepStrictEqual(inspect(parser('&HilbertSpace;'), ctx), [['ℋ'], '']);
48
- assert.deepStrictEqual(inspect(parser('&DifferentialD;'), ctx), [['ⅆ'], '']);
49
- assert.deepStrictEqual(inspect(parser('&ClockwiseContourIntegral;'), ctx), [['∲'], '']);
50
- assert.deepStrictEqual(inspect(parser('&ngE;'), ctx), [['≧̸'], '']);
40
+ assert.deepStrictEqual(inspect(parser, input('&NewLine;', new Context())), [[' '], '']);
41
+ assert.deepStrictEqual(inspect(parser, input('&nbsp;', new Context())), [['\u00A0'], '']);
42
+ assert.deepStrictEqual(inspect(parser, input('&amp;', new Context())), [['&'], '']);
43
+ assert.deepStrictEqual(inspect(parser, input('&copy;', new Context())), [['©'], '']);
44
+ assert.deepStrictEqual(inspect(parser, input('&AElig;', new Context())), [['Æ'], '']);
45
+ assert.deepStrictEqual(inspect(parser, input('&Dcaron;', new Context())), [['Ď'], '']);
46
+ assert.deepStrictEqual(inspect(parser, input('&frac34;', new Context())), [['¾'], '']);
47
+ assert.deepStrictEqual(inspect(parser, input('&HilbertSpace;', new Context())), [['ℋ'], '']);
48
+ assert.deepStrictEqual(inspect(parser, input('&DifferentialD;', new Context())), [['ⅆ'], '']);
49
+ assert.deepStrictEqual(inspect(parser, input('&ClockwiseContourIntegral;', new Context())), [['∲'], '']);
50
+ assert.deepStrictEqual(inspect(parser, input('&ngE;', new Context())), [['≧̸'], '']);
51
51
  });
52
52
 
53
53
  });
@@ -1,6 +1,6 @@
1
1
  import { HTMLEntityParser, UnsafeHTMLEntityParser } from '../inline';
2
2
  import { Backtrack } from '../context';
3
- import { List, Data } from '../../combinator/data/parser';
3
+ import { List, Node } from '../../combinator/data/parser';
4
4
  import { union, surround, fmap } from '../../combinator';
5
5
  import { str } from '../source';
6
6
  import { invalid } from '../util';
@@ -11,16 +11,16 @@ export const unsafehtmlentity: UnsafeHTMLEntityParser = surround(
11
11
  false,
12
12
  [3 | Backtrack.unescapable],
13
13
  ([as, bs, cs]) =>
14
- new List([new Data(parser(as.head!.value + bs.head!.value + cs.head!.value))]),
14
+ new List([new Node(parser(as.head!.value + bs.head!.value + cs.head!.value))]),
15
15
  ([as, bs]) =>
16
- new List([new Data(as.head!.value + (bs?.head?.value ?? ''))]));
16
+ new List([new Node(as.head!.value + (bs?.head?.value ?? ''))]));
17
17
 
18
18
  export const htmlentity: HTMLEntityParser = fmap(
19
19
  union([unsafehtmlentity]),
20
20
  ([{ value }]) => new List([
21
21
  length === 1 || value.at(-1) !== ';'
22
- ? new Data(value)
23
- : new Data(html('span', {
22
+ ? new Node(value)
23
+ : new Node(html('span', {
24
24
  class: 'invalid',
25
25
  ...invalid('htmlentity', 'syntax', 'Invalid HTML entity'),
26
26
  }, value))
@@ -1,46 +1,46 @@
1
1
  import { insertion } from './insertion';
2
2
  import { some } from '../../combinator';
3
3
  import { input } from '../../combinator/data/parser';
4
+ import { Context } from '../context';
4
5
  import { inspect } from '../../debug.test';
5
6
 
6
7
  describe('Unit: parser/inline/insertion', () => {
7
8
  describe('insertion', () => {
8
- const parser = (source: string) => some(insertion)(input(source, ctx));
9
- const { context: ctx } = input('', {});
9
+ const parser = some(insertion);
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('++'), ctx), undefined);
15
- assert.deepStrictEqual(inspect(parser('++a'), ctx), [['++', 'a'], '']);
16
- assert.deepStrictEqual(inspect(parser('++a+'), ctx), [['++', 'a+'], '']);
17
- assert.deepStrictEqual(inspect(parser(' ++a++'), 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('++', new Context())), undefined);
15
+ assert.deepStrictEqual(inspect(parser, input('++a', new Context())), [['++', 'a'], '']);
16
+ assert.deepStrictEqual(inspect(parser, input('++a+', new Context())), [['++', 'a+'], '']);
17
+ assert.deepStrictEqual(inspect(parser, input(' ++a++', new Context())), undefined);
18
18
  });
19
19
 
20
20
  it('basic', () => {
21
- assert.deepStrictEqual(inspect(parser('++a++'), ctx), [['<ins>a</ins>'], '']);
22
- assert.deepStrictEqual(inspect(parser('++a+b++'), ctx), [['<ins>a+b</ins>'], '']);
23
- assert.deepStrictEqual(inspect(parser('++ ++'), ctx), [['<ins> </ins>'], '']);
24
- assert.deepStrictEqual(inspect(parser('++ a++'), ctx), [['<ins> a</ins>'], '']);
25
- assert.deepStrictEqual(inspect(parser('++ a ++'), ctx), [['<ins> a </ins>'], '']);
26
- assert.deepStrictEqual(inspect(parser('++ a ++'), ctx), [['<ins> a </ins>'], '']);
27
- assert.deepStrictEqual(inspect(parser('++\na++'), ctx), [['<ins><br>a</ins>'], '']);
28
- assert.deepStrictEqual(inspect(parser('++\\\na++'), ctx), [['<ins><br>a</ins>'], '']);
29
- assert.deepStrictEqual(inspect(parser('++<wbr>a++'), ctx), [['<ins><wbr>a</ins>'], '']);
30
- assert.deepStrictEqual(inspect(parser('++a ++'), ctx), [['<ins>a </ins>'], '']);
31
- assert.deepStrictEqual(inspect(parser('++a \n ++'), ctx), [['<ins>a </ins>'], '']);
32
- assert.deepStrictEqual(inspect(parser('++a\n++'), ctx), [['<ins>a</ins>'], '']);
33
- assert.deepStrictEqual(inspect(parser('++a\n ++'), ctx), [['<ins>a </ins>'], '']);
34
- assert.deepStrictEqual(inspect(parser('++a\n<wbr>++'), ctx), [['<ins>a<wbr></ins>'], '']);
35
- assert.deepStrictEqual(inspect(parser('++a\nb++'), ctx), [['<ins>a<br>b</ins>'], '']);
36
- assert.deepStrictEqual(inspect(parser('++a\\\nb++'), ctx), [['<ins>a<br>b</ins>'], '']);
37
- assert.deepStrictEqual(inspect(parser('++\\+++'), ctx), [['<ins>+</ins>'], '']);
38
- assert.deepStrictEqual(inspect(parser('++a+++'), ctx), [['<ins>a</ins>'], '+']);
21
+ assert.deepStrictEqual(inspect(parser, input('++a++', new Context())), [['<ins>a</ins>'], '']);
22
+ assert.deepStrictEqual(inspect(parser, input('++a+b++', new Context())), [['<ins>a+b</ins>'], '']);
23
+ assert.deepStrictEqual(inspect(parser, input('++ ++', new Context())), [['<ins> </ins>'], '']);
24
+ assert.deepStrictEqual(inspect(parser, input('++ a++', new Context())), [['<ins> a</ins>'], '']);
25
+ assert.deepStrictEqual(inspect(parser, input('++ a ++', new Context())), [['<ins> a </ins>'], '']);
26
+ assert.deepStrictEqual(inspect(parser, input('++ a ++', new Context())), [['<ins> a </ins>'], '']);
27
+ assert.deepStrictEqual(inspect(parser, input('++\na++', new Context())), [['<ins><br>a</ins>'], '']);
28
+ assert.deepStrictEqual(inspect(parser, input('++\\\na++', new Context())), [['<ins><br>a</ins>'], '']);
29
+ assert.deepStrictEqual(inspect(parser, input('++<wbr>a++', new Context())), [['<ins><wbr>a</ins>'], '']);
30
+ assert.deepStrictEqual(inspect(parser, input('++a ++', new Context())), [['<ins>a </ins>'], '']);
31
+ assert.deepStrictEqual(inspect(parser, input('++a \n ++', new Context())), [['<ins>a </ins>'], '']);
32
+ assert.deepStrictEqual(inspect(parser, input('++a\n++', new Context())), [['<ins>a</ins>'], '']);
33
+ assert.deepStrictEqual(inspect(parser, input('++a\n ++', new Context())), [['<ins>a </ins>'], '']);
34
+ assert.deepStrictEqual(inspect(parser, input('++a\n<wbr>++', new Context())), [['<ins>a<wbr></ins>'], '']);
35
+ assert.deepStrictEqual(inspect(parser, input('++a\nb++', new Context())), [['<ins>a<br>b</ins>'], '']);
36
+ assert.deepStrictEqual(inspect(parser, input('++a\\\nb++', new Context())), [['<ins>a<br>b</ins>'], '']);
37
+ assert.deepStrictEqual(inspect(parser, input('++\\+++', new Context())), [['<ins>+</ins>'], '']);
38
+ assert.deepStrictEqual(inspect(parser, input('++a+++', new Context())), [['<ins>a</ins>'], '+']);
39
39
  });
40
40
 
41
41
  it('nest', () => {
42
- assert.deepStrictEqual(inspect(parser('++*++a++*++'), ctx), [['<ins><em><ins>a</ins></em></ins>'], '']);
43
- assert.deepStrictEqual(inspect(parser('++*~~a~~*++'), ctx), [['<ins><em><del>a</del></em></ins>'], '']);
42
+ assert.deepStrictEqual(inspect(parser, input('++*++a++*++', new Context())), [['<ins><em><ins>a</ins></em></ins>'], '']);
43
+ assert.deepStrictEqual(inspect(parser, input('++*~~a~~*++', new Context())), [['<ins><em><del>a</del></em></ins>'], '']);
44
44
  });
45
45
 
46
46
  });
@@ -1,6 +1,6 @@
1
1
  import { InsertionParser } from '../inline';
2
2
  import { Recursion, Command } from '../context';
3
- import { List, Data } from '../../combinator/data/parser';
3
+ import { List, Node } from '../../combinator/data/parser';
4
4
  import { union, some, recursion, precedence, surround, open, lazy } from '../../combinator';
5
5
  import { inline } from '../inline';
6
6
  import { blankWith } from '../visibility';
@@ -17,6 +17,6 @@ export const insertion: InsertionParser = lazy(() =>
17
17
  ]))),
18
18
  '++',
19
19
  false, [],
20
- ([, bs], { buffer }) => buffer!.import(bs),
21
- ([, bs], { buffer }) => bs && buffer!.import(bs).push(new Data(Command.Cancel)) && buffer!),
22
- nodes => new List([new Data(html('ins', defrag(unwrap(nodes))))]))));
20
+ ([, bs], { buffer }) => buffer.import(bs),
21
+ ([, bs], { buffer }) => bs && buffer.import(bs).push(new Node(Command.Cancel)) && buffer),
22
+ nodes => new List([new Node(html('ins', defrag(unwrap(nodes))))]))));
@@ -1,73 +1,73 @@
1
1
  import { italic } from './italic';
2
2
  import { some } from '../../combinator';
3
3
  import { input } from '../../combinator/data/parser';
4
+ import { Context } from '../context';
4
5
  import { inspect } from '../../debug.test';
5
6
 
6
7
  describe('Unit: parser/inline/italic', () => {
7
8
  describe('italic', () => {
8
- const parser = (source: string) => some(italic)(input(source, ctx));
9
- const { context: ctx } = input('', {});
9
+ const parser = some(italic);
10
10
 
11
11
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser('///'), ctx), undefined);
13
- assert.deepStrictEqual(inspect(parser('///a'), ctx), [['///', 'a'], '']);
14
- assert.deepStrictEqual(inspect(parser('///a ///'), ctx), [['///', 'a', ' ', '///'], '']);
15
- assert.deepStrictEqual(inspect(parser('///a ///'), ctx), [['///', 'a', ' ', '///'], '']);
16
- assert.deepStrictEqual(inspect(parser('///a\n///'), ctx), [['///', 'a', '<br>', '///'], '']);
17
- assert.deepStrictEqual(inspect(parser('///a\\ ///'), ctx), [['///', 'a', ' ', '///'], '']);
18
- assert.deepStrictEqual(inspect(parser('///a\\\n///'), ctx), [['///', 'a', '<br>', '///'], '']);
19
- assert.deepStrictEqual(inspect(parser('///a/b'), ctx), [['///', 'a/b'], '']);
20
- assert.deepStrictEqual(inspect(parser('///a//b'), ctx), [['///', 'a//b'], '']);
21
- assert.deepStrictEqual(inspect(parser('///a*b///'), ctx), [['///', 'a', '*', 'b', '///'], '']);
22
- assert.deepStrictEqual(inspect(parser('/// ///'), ctx), undefined);
23
- assert.deepStrictEqual(inspect(parser('/// a///'), ctx), undefined);
24
- assert.deepStrictEqual(inspect(parser('/// a ///'), ctx), undefined);
25
- assert.deepStrictEqual(inspect(parser('///\n///'), ctx), undefined);
26
- assert.deepStrictEqual(inspect(parser('///\na///'), ctx), undefined);
27
- assert.deepStrictEqual(inspect(parser('///\\ a///'), ctx), undefined);
28
- assert.deepStrictEqual(inspect(parser('///\\\na///'), ctx), undefined);
29
- assert.deepStrictEqual(inspect(parser('///<wbr>a///'), ctx), undefined);
30
- assert.deepStrictEqual(inspect(parser(' ///a///'), ctx), undefined);
12
+ assert.deepStrictEqual(inspect(parser, input('///', new Context())), undefined);
13
+ assert.deepStrictEqual(inspect(parser, input('///a', new Context())), [['///', 'a'], '']);
14
+ assert.deepStrictEqual(inspect(parser, input('///a ///', new Context())), [['///', 'a', ' ', '///'], '']);
15
+ assert.deepStrictEqual(inspect(parser, input('///a ///', new Context())), [['///', 'a', ' ', '///'], '']);
16
+ assert.deepStrictEqual(inspect(parser, input('///a\n///', new Context())), [['///', 'a', '<br>', '///'], '']);
17
+ assert.deepStrictEqual(inspect(parser, input('///a\\ ///', new Context())), [['///', 'a', ' ', '///'], '']);
18
+ assert.deepStrictEqual(inspect(parser, input('///a\\\n///', new Context())), [['///', 'a', '<br>', '///'], '']);
19
+ assert.deepStrictEqual(inspect(parser, input('///a/b', new Context())), [['///', 'a/b'], '']);
20
+ assert.deepStrictEqual(inspect(parser, input('///a//b', new Context())), [['///', 'a//b'], '']);
21
+ assert.deepStrictEqual(inspect(parser, input('///a*b///', new Context())), [['///', 'a', '*', 'b', '///'], '']);
22
+ assert.deepStrictEqual(inspect(parser, input('/// ///', new Context())), undefined);
23
+ assert.deepStrictEqual(inspect(parser, input('/// a///', new Context())), undefined);
24
+ assert.deepStrictEqual(inspect(parser, input('/// a ///', new Context())), undefined);
25
+ assert.deepStrictEqual(inspect(parser, input('///\n///', new Context())), undefined);
26
+ assert.deepStrictEqual(inspect(parser, input('///\na///', new Context())), undefined);
27
+ assert.deepStrictEqual(inspect(parser, input('///\\ a///', new Context())), undefined);
28
+ assert.deepStrictEqual(inspect(parser, input('///\\\na///', new Context())), undefined);
29
+ assert.deepStrictEqual(inspect(parser, input('///<wbr>a///', new Context())), undefined);
30
+ assert.deepStrictEqual(inspect(parser, input(' ///a///', new Context())), undefined);
31
31
  });
32
32
 
33
33
  it('basic', () => {
34
- assert.deepStrictEqual(inspect(parser('///a///'), ctx), [['<i>a</i>'], '']);
35
- assert.deepStrictEqual(inspect(parser('///ab///'), ctx), [['<i>ab</i>'], '']);
36
- assert.deepStrictEqual(inspect(parser('///a////'), ctx), [['<i>a</i>'], '/']);
37
- assert.deepStrictEqual(inspect(parser('///a\nb///'), ctx), [['<i>a<br>b</i>'], '']);
38
- assert.deepStrictEqual(inspect(parser('///a\\\nb///'), ctx), [['<i>a<br>b</i>'], '']);
34
+ assert.deepStrictEqual(inspect(parser, input('///a///', new Context())), [['<i>a</i>'], '']);
35
+ assert.deepStrictEqual(inspect(parser, input('///ab///', new Context())), [['<i>ab</i>'], '']);
36
+ assert.deepStrictEqual(inspect(parser, input('///a////', new Context())), [['<i>a</i>'], '/']);
37
+ assert.deepStrictEqual(inspect(parser, input('///a\nb///', new Context())), [['<i>a<br>b</i>'], '']);
38
+ assert.deepStrictEqual(inspect(parser, input('///a\\\nb///', new Context())), [['<i>a<br>b</i>'], '']);
39
39
  });
40
40
 
41
41
  it('nest', () => {
42
- assert.deepStrictEqual(inspect(parser('////a///'), ctx), [['/', '<i>a</i>'], '']);
43
- assert.deepStrictEqual(inspect(parser('////a///b'), ctx), [['/', '<i>a</i>'], 'b']);
44
- assert.deepStrictEqual(inspect(parser('////a////'), ctx), [['/', '<i>a</i>', '/'], '']);
45
- assert.deepStrictEqual(inspect(parser('////a////b'), ctx), [['/', '<i>a</i>', '/'], 'b']);
46
- assert.deepStrictEqual(inspect(parser('/////a///'), ctx), [['//', '<i>a</i>'], '']);
47
- assert.deepStrictEqual(inspect(parser('/////a///b'), ctx), [['//', '<i>a</i>'], 'b']);
48
- assert.deepStrictEqual(inspect(parser('/////a////'), ctx), [['//', '<i>a</i>', '/'], '']);
49
- assert.deepStrictEqual(inspect(parser('/////a////b'), ctx), [['//', '<i>a</i>', '/'], 'b']);
50
- assert.deepStrictEqual(inspect(parser('/////a/////'), ctx), [['//', '<i>a</i>', '//'], '']);
51
- assert.deepStrictEqual(inspect(parser('/////a/////b'), ctx), [['//', '<i>a</i>', '//'], 'b']);
52
- assert.deepStrictEqual(inspect(parser('//////a///'), ctx), [['///', '<i>a</i>'], '']);
53
- assert.deepStrictEqual(inspect(parser('//////a///b'), ctx), [['///', '<i>a</i>', 'b'], '']);
54
- assert.deepStrictEqual(inspect(parser('//////a////'), ctx), [['///', '<i>a</i>', '/'], '']);
55
- assert.deepStrictEqual(inspect(parser('//////a////b'), ctx), [['///', '<i>a</i>', '/b'], '']);
56
- assert.deepStrictEqual(inspect(parser('//////a/////'), ctx), [['///', '<i>a</i>', '//'], '']);
57
- assert.deepStrictEqual(inspect(parser('//////a/////b'), ctx), [['///', '<i>a</i>', '//b'], '']);
58
- assert.deepStrictEqual(inspect(parser('//////a//////'), ctx), [['<i><i>a</i></i>'], '']);
59
- assert.deepStrictEqual(inspect(parser('//////a///b///'), ctx), [['<i><i>a</i>b</i>'], '']);
60
- assert.deepStrictEqual(inspect(parser('///a ///b//////'), ctx), [['<i>a <i>b</i></i>'], '']);
61
- assert.deepStrictEqual(inspect(parser('///- ///b//////'), ctx), [['<i>- <i>b</i></i>'], '']);
62
- assert.deepStrictEqual(inspect(parser('///a\\ ///b//////'), ctx), [['<i>a <i>b</i></i>'], '']);
63
- assert.deepStrictEqual(inspect(parser('///a //////b/////////'), ctx), [['<i>a <i><i>b</i></i></i>'], '']);
64
- assert.deepStrictEqual(inspect(parser('///a ///b///c///'), ctx), [['<i>a <i>b</i>c</i>'], '']);
65
- assert.deepStrictEqual(inspect(parser('///a ///b ///c/////////'), ctx), [['<i>a <i>b <i>c</i></i></i>'], '']);
66
- assert.deepStrictEqual(inspect(parser('///a&Tab;///b//////'), ctx), [['<i>a\t<i>b</i></i>'], '']);
67
- assert.deepStrictEqual(inspect(parser('///a<wbr>///b//////'), ctx), [['<i>a<wbr><i>b</i></i>'], '']);
68
- assert.deepStrictEqual(inspect(parser('///`a`///'), ctx), [['<i><code data-src="`a`">a</code></i>'], '']);
69
- assert.deepStrictEqual(inspect(parser('///(///a///)///'), ctx), [['<i><span class="paren">(<i>a</i>)</span></i>'], '']);
70
- assert.deepStrictEqual(inspect(parser('///{http://host/}///'), ctx), [['<i><a class="url" href="http://host/" target="_blank">http://host/</a></i>'], '']);
42
+ assert.deepStrictEqual(inspect(parser, input('////a///', new Context())), [['/', '<i>a</i>'], '']);
43
+ assert.deepStrictEqual(inspect(parser, input('////a///b', new Context())), [['/', '<i>a</i>'], 'b']);
44
+ assert.deepStrictEqual(inspect(parser, input('////a////', new Context())), [['/', '<i>a</i>', '/'], '']);
45
+ assert.deepStrictEqual(inspect(parser, input('////a////b', new Context())), [['/', '<i>a</i>', '/'], 'b']);
46
+ assert.deepStrictEqual(inspect(parser, input('/////a///', new Context())), [['//', '<i>a</i>'], '']);
47
+ assert.deepStrictEqual(inspect(parser, input('/////a///b', new Context())), [['//', '<i>a</i>'], 'b']);
48
+ assert.deepStrictEqual(inspect(parser, input('/////a////', new Context())), [['//', '<i>a</i>', '/'], '']);
49
+ assert.deepStrictEqual(inspect(parser, input('/////a////b', new Context())), [['//', '<i>a</i>', '/'], 'b']);
50
+ assert.deepStrictEqual(inspect(parser, input('/////a/////', new Context())), [['//', '<i>a</i>', '//'], '']);
51
+ assert.deepStrictEqual(inspect(parser, input('/////a/////b', new Context())), [['//', '<i>a</i>', '//'], 'b']);
52
+ assert.deepStrictEqual(inspect(parser, input('//////a///', new Context())), [['///', '<i>a</i>'], '']);
53
+ assert.deepStrictEqual(inspect(parser, input('//////a///b', new Context())), [['///', '<i>a</i>', 'b'], '']);
54
+ assert.deepStrictEqual(inspect(parser, input('//////a////', new Context())), [['///', '<i>a</i>', '/'], '']);
55
+ assert.deepStrictEqual(inspect(parser, input('//////a////b', new Context())), [['///', '<i>a</i>', '/b'], '']);
56
+ assert.deepStrictEqual(inspect(parser, input('//////a/////', new Context())), [['///', '<i>a</i>', '//'], '']);
57
+ assert.deepStrictEqual(inspect(parser, input('//////a/////b', new Context())), [['///', '<i>a</i>', '//b'], '']);
58
+ assert.deepStrictEqual(inspect(parser, input('//////a//////', new Context())), [['<i><i>a</i></i>'], '']);
59
+ assert.deepStrictEqual(inspect(parser, input('//////a///b///', new Context())), [['<i><i>a</i>b</i>'], '']);
60
+ assert.deepStrictEqual(inspect(parser, input('///a ///b//////', new Context())), [['<i>a <i>b</i></i>'], '']);
61
+ assert.deepStrictEqual(inspect(parser, input('///- ///b//////', new Context())), [['<i>- <i>b</i></i>'], '']);
62
+ assert.deepStrictEqual(inspect(parser, input('///a\\ ///b//////', new Context())), [['<i>a <i>b</i></i>'], '']);
63
+ assert.deepStrictEqual(inspect(parser, input('///a //////b/////////', new Context())), [['<i>a <i><i>b</i></i></i>'], '']);
64
+ assert.deepStrictEqual(inspect(parser, input('///a ///b///c///', new Context())), [['<i>a <i>b</i>c</i>'], '']);
65
+ assert.deepStrictEqual(inspect(parser, input('///a ///b ///c/////////', new Context())), [['<i>a <i>b <i>c</i></i></i>'], '']);
66
+ assert.deepStrictEqual(inspect(parser, input('///a&Tab;///b//////', new Context())), [['<i>a\t<i>b</i></i>'], '']);
67
+ assert.deepStrictEqual(inspect(parser, input('///a<wbr>///b//////', new Context())), [['<i>a<wbr><i>b</i></i>'], '']);
68
+ assert.deepStrictEqual(inspect(parser, input('///`a`///', new Context())), [['<i><code data-src="`a`">a</code></i>'], '']);
69
+ assert.deepStrictEqual(inspect(parser, input('///(///a///)///', new Context())), [['<i><span class="paren">(<i>a</i>)</span></i>'], '']);
70
+ assert.deepStrictEqual(inspect(parser, input('///{http://host/}///', new Context())), [['<i><a class="url" href="http://host/" target="_blank">http://host/</a></i>'], '']);
71
71
  });
72
72
 
73
73
  });
@@ -1,6 +1,6 @@
1
1
  import { ItalicParser } from '../inline';
2
2
  import { Recursion, Command } from '../context';
3
- import { List, Data } from '../../combinator/data/parser';
3
+ import { List, Node } from '../../combinator/data/parser';
4
4
  import { union, some, recursion, precedence, surround, open, lazy } from '../../combinator';
5
5
  import { inline } from '../inline';
6
6
  import { tightStart, blankWith } from '../visibility';
@@ -20,6 +20,6 @@ export const italic: ItalicParser = lazy(() =>
20
20
  ])))),
21
21
  '///',
22
22
  false, [],
23
- ([, bs], { buffer }) => buffer!.import(bs),
24
- ([, bs], { buffer }) => bs && buffer!.import(bs).push(new Data(Command.Cancel)) && buffer!),
25
- nodes => new List([new Data(html('i', defrag(unwrap(nodes))))]))));
23
+ ([, bs], { buffer }) => buffer.import(bs),
24
+ ([, bs], { buffer }) => bs && buffer.import(bs).push(new Node(Command.Cancel)) && buffer),
25
+ nodes => new List([new Node(html('i', defrag(unwrap(nodes))))]))));