securemark 0.291.1 → 0.292.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (164) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/design.md +13 -2
  3. package/dist/index.js +1093 -756
  4. package/markdown.d.ts +17 -17
  5. package/package.json +1 -1
  6. package/src/combinator/control/constraint/block.test.ts +8 -5
  7. package/src/combinator/control/constraint/block.ts +9 -9
  8. package/src/combinator/control/constraint/contract.ts +20 -28
  9. package/src/combinator/control/constraint/line.test.ts +9 -6
  10. package/src/combinator/control/constraint/line.ts +21 -22
  11. package/src/combinator/control/manipulation/convert.ts +29 -13
  12. package/src/combinator/control/manipulation/fence.ts +18 -15
  13. package/src/combinator/control/manipulation/indent.test.ts +17 -14
  14. package/src/combinator/control/manipulation/indent.ts +15 -8
  15. package/src/combinator/control/manipulation/match.ts +11 -10
  16. package/src/combinator/control/manipulation/recovery.ts +6 -2
  17. package/src/combinator/control/manipulation/scope.ts +37 -38
  18. package/src/combinator/control/manipulation/surround.ts +78 -60
  19. package/src/combinator/control/manipulation/trim.test.ts +12 -9
  20. package/src/combinator/control/monad/bind.ts +16 -16
  21. package/src/combinator/control/monad/fmap.ts +6 -6
  22. package/src/combinator/data/parser/context/delimiter.ts +8 -7
  23. package/src/combinator/data/parser/context.test.ts +19 -14
  24. package/src/combinator/data/parser/context.ts +20 -16
  25. package/src/combinator/data/parser/inits.ts +13 -14
  26. package/src/combinator/data/parser/sequence.test.ts +16 -15
  27. package/src/combinator/data/parser/sequence.ts +13 -14
  28. package/src/combinator/data/parser/some.test.ts +19 -18
  29. package/src/combinator/data/parser/some.ts +13 -15
  30. package/src/combinator/data/parser/subsequence.test.ts +22 -21
  31. package/src/combinator/data/parser/subsequence.ts +3 -3
  32. package/src/combinator/data/parser/tails.ts +3 -3
  33. package/src/combinator/data/parser/union.test.ts +16 -15
  34. package/src/combinator/data/parser/union.ts +2 -2
  35. package/src/combinator/data/parser.ts +66 -28
  36. package/src/debug.test.ts +3 -3
  37. package/src/parser/api/bind.ts +3 -3
  38. package/src/parser/api/header.ts +7 -6
  39. package/src/parser/api/normalize.ts +2 -2
  40. package/src/parser/api/parse.test.ts +14 -15
  41. package/src/parser/api/parse.ts +3 -3
  42. package/src/parser/autolink.test.ts +19 -17
  43. package/src/parser/block/blockquote.test.ts +86 -84
  44. package/src/parser/block/blockquote.ts +4 -2
  45. package/src/parser/block/codeblock.test.ts +58 -56
  46. package/src/parser/block/codeblock.ts +3 -3
  47. package/src/parser/block/dlist.test.ts +58 -56
  48. package/src/parser/block/extension/aside.test.ts +10 -8
  49. package/src/parser/block/extension/aside.ts +1 -1
  50. package/src/parser/block/extension/example.test.ts +20 -18
  51. package/src/parser/block/extension/example.ts +3 -3
  52. package/src/parser/block/extension/fig.test.ts +38 -36
  53. package/src/parser/block/extension/fig.ts +1 -1
  54. package/src/parser/block/extension/figbase.test.ts +17 -15
  55. package/src/parser/block/extension/figure.test.ts +64 -62
  56. package/src/parser/block/extension/figure.ts +3 -2
  57. package/src/parser/block/extension/message.test.ts +15 -13
  58. package/src/parser/block/extension/message.ts +3 -3
  59. package/src/parser/block/extension/placeholder.test.ts +3 -1
  60. package/src/parser/block/extension/table.test.ts +73 -71
  61. package/src/parser/block/extension/table.ts +5 -5
  62. package/src/parser/block/extension.test.ts +3 -1
  63. package/src/parser/block/heading.test.ts +65 -64
  64. package/src/parser/block/heading.ts +3 -3
  65. package/src/parser/block/ilist.test.ts +3 -1
  66. package/src/parser/block/ilist.ts +3 -3
  67. package/src/parser/block/mathblock.test.ts +33 -31
  68. package/src/parser/block/mathblock.ts +1 -1
  69. package/src/parser/block/mediablock.ts +2 -2
  70. package/src/parser/block/olist.test.ts +99 -97
  71. package/src/parser/block/olist.ts +2 -2
  72. package/src/parser/block/pagebreak.test.ts +17 -15
  73. package/src/parser/block/pagebreak.ts +1 -1
  74. package/src/parser/block/paragraph.test.ts +60 -57
  75. package/src/parser/block/reply/cite.test.ts +41 -39
  76. package/src/parser/block/reply/cite.ts +3 -3
  77. package/src/parser/block/reply/quote.test.ts +52 -50
  78. package/src/parser/block/reply.test.ts +21 -19
  79. package/src/parser/block/sidefence.test.ts +51 -49
  80. package/src/parser/block/table.test.ts +51 -50
  81. package/src/parser/block/table.ts +6 -6
  82. package/src/parser/block/ulist.test.ts +52 -50
  83. package/src/parser/block/ulist.ts +2 -2
  84. package/src/parser/block.ts +6 -5
  85. package/src/parser/context.ts +1 -0
  86. package/src/parser/header.test.ts +22 -21
  87. package/src/parser/header.ts +25 -13
  88. package/src/parser/inline/annotation.test.ts +44 -42
  89. package/src/parser/inline/annotation.ts +2 -2
  90. package/src/parser/inline/autolink/account.test.ts +32 -30
  91. package/src/parser/inline/autolink/account.ts +1 -1
  92. package/src/parser/inline/autolink/anchor.test.ts +23 -21
  93. package/src/parser/inline/autolink/anchor.ts +1 -1
  94. package/src/parser/inline/autolink/channel.test.ts +16 -14
  95. package/src/parser/inline/autolink/channel.ts +2 -2
  96. package/src/parser/inline/autolink/email.test.ts +38 -36
  97. package/src/parser/inline/autolink/email.ts +2 -2
  98. package/src/parser/inline/autolink/hashnum.test.ts +39 -37
  99. package/src/parser/inline/autolink/hashnum.ts +1 -1
  100. package/src/parser/inline/autolink/hashtag.test.ts +58 -56
  101. package/src/parser/inline/autolink/hashtag.ts +1 -1
  102. package/src/parser/inline/autolink/url.test.ts +76 -74
  103. package/src/parser/inline/autolink/url.ts +6 -6
  104. package/src/parser/inline/bracket.test.ts +69 -67
  105. package/src/parser/inline/bracket.ts +32 -32
  106. package/src/parser/inline/code.test.ts +32 -29
  107. package/src/parser/inline/code.ts +20 -13
  108. package/src/parser/inline/deletion.test.ts +29 -27
  109. package/src/parser/inline/deletion.ts +2 -2
  110. package/src/parser/inline/emphasis.test.ts +40 -36
  111. package/src/parser/inline/emphasis.ts +2 -2
  112. package/src/parser/inline/emstrong.test.ts +102 -96
  113. package/src/parser/inline/emstrong.ts +96 -36
  114. package/src/parser/inline/extension/index.test.ts +91 -89
  115. package/src/parser/inline/extension/index.ts +18 -30
  116. package/src/parser/inline/extension/indexee.ts +1 -1
  117. package/src/parser/inline/extension/indexer.test.ts +26 -24
  118. package/src/parser/inline/extension/indexer.ts +1 -1
  119. package/src/parser/inline/extension/label.test.ts +34 -32
  120. package/src/parser/inline/extension/placeholder.test.ts +44 -42
  121. package/src/parser/inline/extension/placeholder.ts +11 -8
  122. package/src/parser/inline/html.test.ts +108 -106
  123. package/src/parser/inline/html.ts +24 -23
  124. package/src/parser/inline/htmlentity.test.ts +39 -37
  125. package/src/parser/inline/htmlentity.ts +9 -3
  126. package/src/parser/inline/insertion.test.ts +29 -27
  127. package/src/parser/inline/insertion.ts +2 -2
  128. package/src/parser/inline/italic.test.ts +55 -53
  129. package/src/parser/inline/italic.ts +2 -2
  130. package/src/parser/inline/link.test.ts +187 -185
  131. package/src/parser/inline/link.ts +30 -12
  132. package/src/parser/inline/mark.test.ts +31 -29
  133. package/src/parser/inline/mark.ts +3 -3
  134. package/src/parser/inline/math.test.ts +133 -131
  135. package/src/parser/inline/math.ts +2 -2
  136. package/src/parser/inline/media.test.ts +93 -91
  137. package/src/parser/inline/media.ts +41 -17
  138. package/src/parser/inline/reference.test.ts +110 -108
  139. package/src/parser/inline/reference.ts +48 -39
  140. package/src/parser/inline/remark.test.ts +53 -51
  141. package/src/parser/inline/remark.ts +3 -3
  142. package/src/parser/inline/ruby.test.ts +46 -44
  143. package/src/parser/inline/ruby.ts +24 -27
  144. package/src/parser/inline/shortmedia.test.ts +11 -9
  145. package/src/parser/inline/strong.test.ts +37 -33
  146. package/src/parser/inline/strong.ts +6 -3
  147. package/src/parser/inline/template.test.ts +24 -22
  148. package/src/parser/inline/template.ts +20 -11
  149. package/src/parser/inline.test.ts +221 -220
  150. package/src/parser/inline.ts +13 -8
  151. package/src/parser/segment.ts +13 -8
  152. package/src/parser/source/escapable.test.ts +24 -22
  153. package/src/parser/source/escapable.ts +26 -41
  154. package/src/parser/source/line.test.ts +19 -17
  155. package/src/parser/source/line.ts +3 -3
  156. package/src/parser/source/str.ts +28 -11
  157. package/src/parser/source/text.test.ts +85 -83
  158. package/src/parser/source/text.ts +26 -54
  159. package/src/parser/source/unescapable.test.ts +24 -22
  160. package/src/parser/source/unescapable.ts +18 -33
  161. package/src/parser/source.ts +1 -1
  162. package/src/parser/util.ts +36 -33
  163. package/src/parser/visibility.ts +19 -15
  164. package/src/util/quote.ts +4 -2
@@ -1,128 +1,130 @@
1
1
  import { reference } from './reference';
2
2
  import { some } from '../../combinator';
3
+ import { input } from '../../combinator/data/parser';
3
4
  import { inspect } from '../../debug.test';
4
5
 
5
6
  describe('Unit: parser/inline/reference', () => {
6
7
  describe('reference', () => {
7
- const parser = (source: string) => some(reference)({ source, context: {} });
8
+ const parser = (source: string) => some(reference)(input(source, ctx));
9
+ const { context: ctx } = input('', {});
8
10
 
9
11
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('')), undefined);
11
- assert.deepStrictEqual(inspect(parser('[')), undefined);
12
- assert.deepStrictEqual(inspect(parser('[]')), undefined);
13
- assert.deepStrictEqual(inspect(parser('[[')), undefined);
14
- assert.deepStrictEqual(inspect(parser('[[]]')), undefined);
15
- assert.deepStrictEqual(inspect(parser('[[]]]')), undefined);
16
- assert.deepStrictEqual(inspect(parser('[["]]')), undefined);
17
- assert.deepStrictEqual(inspect(parser('[[(]]')), undefined);
18
- assert.deepStrictEqual(inspect(parser('[[<bdi>]]')), undefined);
19
- assert.deepStrictEqual(inspect(parser('[[ ]]')), undefined);
20
- assert.deepStrictEqual(inspect(parser('[[ [a')), undefined);
21
- assert.deepStrictEqual(inspect(parser('[[\n]]')), undefined);
22
- assert.deepStrictEqual(inspect(parser('[[\na]]')), undefined);
23
- assert.deepStrictEqual(inspect(parser('[[\\\na]]')), undefined);
24
- assert.deepStrictEqual(inspect(parser('[[a\n]]')), undefined);
25
- assert.deepStrictEqual(inspect(parser('[[a\\\n]]')), undefined);
26
- assert.deepStrictEqual(inspect(parser('[[a\nb]]')), undefined);
27
- assert.deepStrictEqual(inspect(parser('[[a\\\nb]]')), undefined);
28
- assert.deepStrictEqual(inspect(parser('[[*a\nb*]]')), undefined);
29
- assert.deepStrictEqual(inspect(parser('[[\\]]')), undefined);
30
- assert.deepStrictEqual(inspect(parser('[[a]b]]')), undefined);
31
- assert.deepStrictEqual(inspect(parser('[[[a]]')), undefined);
32
- assert.deepStrictEqual(inspect(parser(' [[a]]')), undefined);
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('[['), ctx), undefined);
16
+ assert.deepStrictEqual(inspect(parser('[[]]'), ctx), undefined);
17
+ assert.deepStrictEqual(inspect(parser('[[]]]'), ctx), undefined);
18
+ assert.deepStrictEqual(inspect(parser('[["]]'), ctx), undefined);
19
+ assert.deepStrictEqual(inspect(parser('[[(]]'), ctx), undefined);
20
+ assert.deepStrictEqual(inspect(parser('[[<bdi>]]'), ctx), undefined);
21
+ assert.deepStrictEqual(inspect(parser('[[ ]]'), ctx), undefined);
22
+ assert.deepStrictEqual(inspect(parser('[[ [a'), ctx), undefined);
23
+ assert.deepStrictEqual(inspect(parser('[[\n]]'), ctx), undefined);
24
+ assert.deepStrictEqual(inspect(parser('[[\na]]'), ctx), undefined);
25
+ assert.deepStrictEqual(inspect(parser('[[\\\na]]'), ctx), undefined);
26
+ assert.deepStrictEqual(inspect(parser('[[a\n]]'), ctx), undefined);
27
+ assert.deepStrictEqual(inspect(parser('[[a\\\n]]'), ctx), undefined);
28
+ assert.deepStrictEqual(inspect(parser('[[a\nb]]'), ctx), undefined);
29
+ assert.deepStrictEqual(inspect(parser('[[a\\\nb]]'), ctx), undefined);
30
+ assert.deepStrictEqual(inspect(parser('[[*a\nb*]]'), ctx), undefined);
31
+ assert.deepStrictEqual(inspect(parser('[[\\]]'), ctx), undefined);
32
+ assert.deepStrictEqual(inspect(parser('[[a]b]]'), ctx), undefined);
33
+ assert.deepStrictEqual(inspect(parser('[[[a]]'), ctx), undefined);
34
+ assert.deepStrictEqual(inspect(parser(' [[a]]'), ctx), undefined);
33
35
  });
34
36
 
35
37
  it('basic', () => {
36
- assert.deepStrictEqual(inspect(parser('[[ a]]')), [['<sup class="reference"><span>a</span></sup>'], '']);
37
- assert.deepStrictEqual(inspect(parser('[[ a ]]')), [['<sup class="reference"><span>a</span></sup>'], '']);
38
- assert.deepStrictEqual(inspect(parser('[[\\ a]]')), [['<sup class="reference"><span>a</span></sup>'], '']);
39
- assert.deepStrictEqual(inspect(parser('[[<wbr>a]]')), [['<sup class="reference"><span>a</span></sup>'], '']);
40
- assert.deepStrictEqual(inspect(parser('[[a]]')), [['<sup class="reference"><span>a</span></sup>'], '']);
41
- assert.deepStrictEqual(inspect(parser('[[a ]]')), [['<sup class="reference"><span>a</span></sup>'], '']);
42
- assert.deepStrictEqual(inspect(parser('[[a ]]')), [['<sup class="reference"><span>a</span></sup>'], '']);
43
- assert.deepStrictEqual(inspect(parser('[[a &nbsp;]]')), [['<sup class="reference"><span>a</span></sup>'], '']);
44
- assert.deepStrictEqual(inspect(parser('[[a <wbr>]]')), [['<sup class="reference"><span>a</span></sup>'], '']);
45
- assert.deepStrictEqual(inspect(parser('[[ab]]')), [['<sup class="reference"><span>ab</span></sup>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('[[ a]]'), ctx), [['<sup class="reference"><span>a</span></sup>'], '']);
39
+ assert.deepStrictEqual(inspect(parser('[[ a ]]'), ctx), [['<sup class="reference"><span>a</span></sup>'], '']);
40
+ assert.deepStrictEqual(inspect(parser('[[\\ a]]'), ctx), [['<sup class="reference"><span>a</span></sup>'], '']);
41
+ assert.deepStrictEqual(inspect(parser('[[<wbr>a]]'), ctx), [['<sup class="reference"><span>a</span></sup>'], '']);
42
+ assert.deepStrictEqual(inspect(parser('[[a]]'), ctx), [['<sup class="reference"><span>a</span></sup>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('[[a ]]'), ctx), [['<sup class="reference"><span>a</span></sup>'], '']);
44
+ assert.deepStrictEqual(inspect(parser('[[a ]]'), ctx), [['<sup class="reference"><span>a</span></sup>'], '']);
45
+ assert.deepStrictEqual(inspect(parser('[[a &nbsp;]]'), ctx), [['<sup class="reference"><span>a</span></sup>'], '']);
46
+ assert.deepStrictEqual(inspect(parser('[[a <wbr>]]'), ctx), [['<sup class="reference"><span>a</span></sup>'], '']);
47
+ assert.deepStrictEqual(inspect(parser('[[ab]]'), ctx), [['<sup class="reference"><span>ab</span></sup>'], '']);
46
48
  });
47
49
 
48
50
  it('nest', () => {
49
- assert.deepStrictEqual(inspect(parser('[[`a`]]')), [['<sup class="reference"><span><code data-src="`a`">a</code></span></sup>'], '']);
50
- assert.deepStrictEqual(inspect(parser('[[@a]]')), [['<sup class="reference"><span><a class="account" href="/@a">@a</a></span></sup>'], '']);
51
- assert.deepStrictEqual(inspect(parser('[[http://host]]')), [['<sup class="reference"><span><a class="url" href="http://host" target="_blank">http://host</a></span></sup>'], '']);
52
- assert.deepStrictEqual(inspect(parser('[[![]{a}]]')), [['<sup class="reference"><span>!<a class="url" href="a">a</a></span></sup>'], '']);
53
- assert.deepStrictEqual(inspect(parser('[[[a]]]')), [['<sup class="reference"><span>[a]</span></sup>'], '']);
54
- assert.deepStrictEqual(inspect(parser('[[[[a]]]]')), [['<sup class="reference"><span>[[a]]</span></sup>'], '']);
55
- assert.deepStrictEqual(inspect(parser('[[((a))]]')), [['<sup class="reference"><span><span class="paren">((a))</span></span></sup>'], '']);
51
+ assert.deepStrictEqual(inspect(parser('[[`a`]]'), ctx), [['<sup class="reference"><span><code data-src="`a`">a</code></span></sup>'], '']);
52
+ assert.deepStrictEqual(inspect(parser('[[@a]]'), ctx), [['<sup class="reference"><span><a class="account" href="/@a">@a</a></span></sup>'], '']);
53
+ assert.deepStrictEqual(inspect(parser('[[http://host]]'), ctx), [['<sup class="reference"><span><a class="url" href="http://host" target="_blank">http://host</a></span></sup>'], '']);
54
+ assert.deepStrictEqual(inspect(parser('[[![]{a}]]'), ctx), [['<sup class="reference"><span>!<a class="url" href="a">a</a></span></sup>'], '']);
55
+ assert.deepStrictEqual(inspect(parser('[[[a]]]'), ctx), [['<sup class="reference"><span>[a]</span></sup>'], '']);
56
+ assert.deepStrictEqual(inspect(parser('[[[[a]]]]'), ctx), [['<sup class="reference"><span>[[a]]</span></sup>'], '']);
57
+ assert.deepStrictEqual(inspect(parser('[[((a))]]'), ctx), [['<sup class="reference"><span><span class="paren">((a))</span></span></sup>'], '']);
56
58
  });
57
59
 
58
60
  it('abbr', () => {
59
- assert.deepStrictEqual(inspect(parser('[[^]]')), [['<sup class="invalid"><span>^</span></sup>'], '']);
60
- assert.deepStrictEqual(inspect(parser('[[^A]]')), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
61
- assert.deepStrictEqual(inspect(parser('[[^A,]]')), [['<sup class="reference" data-abbr="A,"><span></span></sup>'], '']);
62
- assert.deepStrictEqual(inspect(parser('[[^A, ]]')), [['<sup class="reference" data-abbr="A,"><span></span></sup>'], '']);
63
- assert.deepStrictEqual(inspect(parser('[[^A.]]')), [['<sup class="reference" data-abbr="A."><span></span></sup>'], '']);
64
- assert.deepStrictEqual(inspect(parser('[[^A.,]]')), [['<sup class="reference" data-abbr="A.,"><span></span></sup>'], '']);
65
- assert.deepStrictEqual(inspect(parser('[[^A?]]')), [['<sup class="reference" data-abbr="A?"><span></span></sup>'], '']);
66
- assert.deepStrictEqual(inspect(parser('[[^A?,]]')), [['<sup class="reference" data-abbr="A?,"><span></span></sup>'], '']);
67
- assert.deepStrictEqual(inspect(parser('[[^A ]]')), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
68
- assert.deepStrictEqual(inspect(parser('[[^A ]]')), [['<sup class="invalid"><span>^A</span></sup>'], '']);
69
- assert.deepStrictEqual(inspect(parser('[[^A B]]')), [['<sup class="reference" data-abbr="A B"><span></span></sup>'], '']);
70
- assert.deepStrictEqual(inspect(parser('[[^A B]]')), [['<sup class="invalid"><span>^A B</span></sup>'], '']);
71
- assert.deepStrictEqual(inspect(parser('[[^A|]]')), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
72
- assert.deepStrictEqual(inspect(parser('[[^A,|]]')), [['<sup class="reference" data-abbr="A,"><span></span></sup>'], '']);
73
- assert.deepStrictEqual(inspect(parser('[[^A |]]')), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
74
- assert.deepStrictEqual(inspect(parser('[[^A|b]]')), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
75
- assert.deepStrictEqual(inspect(parser('[[^A|b]]')), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
76
- assert.deepStrictEqual(inspect(parser('[[^A|b ]]')), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
77
- assert.deepStrictEqual(inspect(parser('[[^A|b ]]')), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
78
- assert.deepStrictEqual(inspect(parser('[[^A|<wbr>]]')), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
79
- assert.deepStrictEqual(inspect(parser('[[^A|<wbr>b]]')), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
80
- assert.deepStrictEqual(inspect(parser('[[^A| ]]')), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
81
- assert.deepStrictEqual(inspect(parser('[[^A| b]]')), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
82
- assert.deepStrictEqual(inspect(parser('[[^A| ]]')), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
83
- assert.deepStrictEqual(inspect(parser('[[^A|^]]')), [['<sup class="reference" data-abbr="A"><span>^</span></sup>'], '']);
84
- assert.deepStrictEqual(inspect(parser('[[^A|^B]]')), [['<sup class="reference" data-abbr="A"><span>^B</span></sup>'], '']);
85
- assert.deepStrictEqual(inspect(parser('[[^1]]')), [['<sup class="invalid"><span>^1</span></sup>'], '']);
86
- assert.deepStrictEqual(inspect(parser('[[^1A]]')), [['<sup class="invalid"><span>^1A</span></sup>'], '']);
87
- assert.deepStrictEqual(inspect(parser('[[^1 ]]')), [['<sup class="invalid"><span>^1</span></sup>'], '']);
88
- assert.deepStrictEqual(inspect(parser('[[^1 A]]')), [['<sup class="invalid"><span>^1 A</span></sup>'], '']);
89
- assert.deepStrictEqual(inspect(parser('[[^1|]]')), [['<sup class="invalid"><span>^1|</span></sup>'], '']);
90
- assert.deepStrictEqual(inspect(parser('[[^1 |]]')), [['<sup class="invalid"><span>^1 |</span></sup>'], '']);
91
- assert.deepStrictEqual(inspect(parser('[[^Abc]]')), [['<sup class="reference" data-abbr="Abc"><span></span></sup>'], '']);
92
- assert.deepStrictEqual(inspect(parser('[[^A, B]]')), [['<sup class="reference" data-abbr="A, B"><span></span></sup>'], '']);
93
- assert.deepStrictEqual(inspect(parser(`[[^A's, Aces']]`)), [[`<sup class="reference" data-abbr="A's, Aces'"><span></span></sup>`], '']);
94
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020]]')), [['<sup class="reference" data-abbr="Xyz 2020"><span></span></sup>'], '']);
95
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1]]')), [['<sup class="reference" data-abbr="Xyz 2020, 1"><span></span></sup>'], '']);
96
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1, 2]]')), [['<sup class="reference" data-abbr="Xyz 2020, 1, 2"><span></span></sup>'], '']);
97
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1, fig. 1]]')), [['<sup class="reference" data-abbr="Xyz 2020, 1, fig. 1"><span></span></sup>'], '']);
98
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1, fig. 1.1]]')), [['<sup class="reference" data-abbr="Xyz 2020, 1, fig. 1.1"><span></span></sup>'], '']);
99
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1, fig. 1.1-2.1b]]')), [['<sup class="reference" data-abbr="Xyz 2020, 1, fig. 1.1-2.1b"><span></span></sup>'], '']);
100
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1, fig. 1.1a-b]]')), [['<sup class="reference" data-abbr="Xyz 2020, 1, fig. 1.1a-b"><span></span></sup>'], '']);
101
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1-2]]')), [['<sup class="reference" data-abbr="Xyz 2020, 1-2"><span></span></sup>'], '']);
102
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1:1-2]]')), [['<sup class="reference" data-abbr="Xyz 2020, 1:1-2"><span></span></sup>'], '']);
103
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1n]]')), [['<sup class="reference" data-abbr="Xyz 2020, 1n"><span></span></sup>'], '']);
104
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1n1]]')), [['<sup class="reference" data-abbr="Xyz 2020, 1n1"><span></span></sup>'], '']);
105
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1nn1-2]]')), [['<sup class="reference" data-abbr="Xyz 2020, 1nn1-2"><span></span></sup>'], '']);
106
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, i]]')), [['<sup class="reference" data-abbr="Xyz 2020, i"><span></span></sup>'], '']);
107
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, capter 1]]')), [['<sup class="reference" data-abbr="Xyz 2020, capter 1"><span></span></sup>'], '']);
108
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, cap. 1]]')), [['<sup class="reference" data-abbr="Xyz 2020, cap. 1"><span></span></sup>'], '']);
109
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020a]]')), [['<sup class="reference" data-abbr="Xyz 2020a"><span></span></sup>'], '']);
110
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020a, 1]]')), [['<sup class="reference" data-abbr="Xyz 2020a, 1"><span></span></sup>'], '']);
111
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020-2021a]]')), [['<sup class="reference" data-abbr="Xyz 2020-2021a"><span></span></sup>'], '']);
112
- assert.deepStrictEqual(inspect(parser('[[^Xyz 2020-2021a, 1]]')), [['<sup class="reference" data-abbr="Xyz 2020-2021a, 1"><span></span></sup>'], '']);
113
- assert.deepStrictEqual(inspect(parser('[[^Xyz, April 1, 2020]]')), [['<sup class="reference" data-abbr="Xyz, April 1, 2020"><span></span></sup>'], '']);
114
- assert.deepStrictEqual(inspect(parser('[[^Xyz, April 1, 2020, 1]]')), [['<sup class="reference" data-abbr="Xyz, April 1, 2020, 1"><span></span></sup>'], '']);
115
- assert.deepStrictEqual(inspect(parser('[[^Xyz n.d.]]')), [['<sup class="reference" data-abbr="Xyz n.d."><span></span></sup>'], '']);
116
- assert.deepStrictEqual(inspect(parser('[[^Xyz n.d., 1]]')), [['<sup class="reference" data-abbr="Xyz n.d., 1"><span></span></sup>'], '']);
117
- assert.deepStrictEqual(inspect(parser('[[^X. Y., and Z et al. 2020, 1-2]]')), [['<sup class="reference" data-abbr="X. Y., and Z et al. 2020, 1-2"><span></span></sup>'], '']);
118
- assert.deepStrictEqual(inspect(parser('[[^^]]')), [['<sup class="invalid"><span>^^</span></sup>'], '']);
119
- assert.deepStrictEqual(inspect(parser('[[\\^]]')), [['<sup class="reference"><span>^</span></sup>'], '']);
120
- assert.deepStrictEqual(inspect(parser('[[^ ]]')), [['<sup class="invalid"><span>^</span></sup>'], '']);
121
- assert.deepStrictEqual(inspect(parser('[[^ A]]')), [['<sup class="invalid"><span>^ A</span></sup>'], '']);
122
- assert.deepStrictEqual(inspect(parser('[[^ |]]')), [['<sup class="invalid"><span>^ |</span></sup>'], '']);
123
- assert.deepStrictEqual(inspect(parser('[[^ |b]]')), [['<sup class="invalid"><span>^ |b</span></sup>'], '']);
124
- assert.deepStrictEqual(inspect(parser('[[^ | ]]')), [['<sup class="invalid"><span>^ |</span></sup>'], '']);
125
- assert.deepStrictEqual(inspect(parser('[[^ | b]]')), [['<sup class="invalid"><span>^ | b</span></sup>'], '']);
61
+ assert.deepStrictEqual(inspect(parser('[[^]]'), ctx), [['<sup class="invalid"><span>^</span></sup>'], '']);
62
+ assert.deepStrictEqual(inspect(parser('[[^A]]'), ctx), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
63
+ assert.deepStrictEqual(inspect(parser('[[^A,]]'), ctx), [['<sup class="reference" data-abbr="A,"><span></span></sup>'], '']);
64
+ assert.deepStrictEqual(inspect(parser('[[^A, ]]'), ctx), [['<sup class="reference" data-abbr="A,"><span></span></sup>'], '']);
65
+ assert.deepStrictEqual(inspect(parser('[[^A.]]'), ctx), [['<sup class="reference" data-abbr="A."><span></span></sup>'], '']);
66
+ assert.deepStrictEqual(inspect(parser('[[^A.,]]'), ctx), [['<sup class="reference" data-abbr="A.,"><span></span></sup>'], '']);
67
+ assert.deepStrictEqual(inspect(parser('[[^A?]]'), ctx), [['<sup class="reference" data-abbr="A?"><span></span></sup>'], '']);
68
+ assert.deepStrictEqual(inspect(parser('[[^A?,]]'), ctx), [['<sup class="reference" data-abbr="A?,"><span></span></sup>'], '']);
69
+ assert.deepStrictEqual(inspect(parser('[[^A ]]'), ctx), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
70
+ assert.deepStrictEqual(inspect(parser('[[^A ]]'), ctx), [['<sup class="invalid"><span>^A</span></sup>'], '']);
71
+ assert.deepStrictEqual(inspect(parser('[[^A B]]'), ctx), [['<sup class="reference" data-abbr="A B"><span></span></sup>'], '']);
72
+ assert.deepStrictEqual(inspect(parser('[[^A B]]'), ctx), [['<sup class="invalid"><span>^A B</span></sup>'], '']);
73
+ assert.deepStrictEqual(inspect(parser('[[^A|]]'), ctx), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
74
+ assert.deepStrictEqual(inspect(parser('[[^A,|]]'), ctx), [['<sup class="reference" data-abbr="A,"><span></span></sup>'], '']);
75
+ assert.deepStrictEqual(inspect(parser('[[^A |]]'), ctx), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
76
+ assert.deepStrictEqual(inspect(parser('[[^A|b]]'), ctx), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
77
+ assert.deepStrictEqual(inspect(parser('[[^A|b]]'), ctx), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
78
+ assert.deepStrictEqual(inspect(parser('[[^A|b ]]'), ctx), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
79
+ assert.deepStrictEqual(inspect(parser('[[^A|b ]]'), ctx), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
80
+ assert.deepStrictEqual(inspect(parser('[[^A|<wbr>]]'), ctx), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
81
+ assert.deepStrictEqual(inspect(parser('[[^A|<wbr>b]]'), ctx), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
82
+ assert.deepStrictEqual(inspect(parser('[[^A| ]]'), ctx), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
83
+ assert.deepStrictEqual(inspect(parser('[[^A| b]]'), ctx), [['<sup class="reference" data-abbr="A"><span>b</span></sup>'], '']);
84
+ assert.deepStrictEqual(inspect(parser('[[^A| ]]'), ctx), [['<sup class="reference" data-abbr="A"><span></span></sup>'], '']);
85
+ assert.deepStrictEqual(inspect(parser('[[^A|^]]'), ctx), [['<sup class="reference" data-abbr="A"><span>^</span></sup>'], '']);
86
+ assert.deepStrictEqual(inspect(parser('[[^A|^B]]'), ctx), [['<sup class="reference" data-abbr="A"><span>^B</span></sup>'], '']);
87
+ assert.deepStrictEqual(inspect(parser('[[^1]]'), ctx), [['<sup class="invalid"><span>^1</span></sup>'], '']);
88
+ assert.deepStrictEqual(inspect(parser('[[^1A]]'), ctx), [['<sup class="invalid"><span>^1A</span></sup>'], '']);
89
+ assert.deepStrictEqual(inspect(parser('[[^1 ]]'), ctx), [['<sup class="invalid"><span>^1</span></sup>'], '']);
90
+ assert.deepStrictEqual(inspect(parser('[[^1 A]]'), ctx), [['<sup class="invalid"><span>^1 A</span></sup>'], '']);
91
+ assert.deepStrictEqual(inspect(parser('[[^1|]]'), ctx), [['<sup class="invalid"><span>^1|</span></sup>'], '']);
92
+ assert.deepStrictEqual(inspect(parser('[[^1 |]]'), ctx), [['<sup class="invalid"><span>^1 |</span></sup>'], '']);
93
+ assert.deepStrictEqual(inspect(parser('[[^Abc]]'), ctx), [['<sup class="reference" data-abbr="Abc"><span></span></sup>'], '']);
94
+ assert.deepStrictEqual(inspect(parser('[[^A, B]]'), ctx), [['<sup class="reference" data-abbr="A, B"><span></span></sup>'], '']);
95
+ assert.deepStrictEqual(inspect(parser(`[[^A's, Aces']]`), ctx), [[`<sup class="reference" data-abbr="A's, Aces'"><span></span></sup>`], '']);
96
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020"><span></span></sup>'], '']);
97
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, 1"><span></span></sup>'], '']);
98
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1, 2]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, 1, 2"><span></span></sup>'], '']);
99
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1, fig. 1]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, 1, fig. 1"><span></span></sup>'], '']);
100
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1, fig. 1.1]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, 1, fig. 1.1"><span></span></sup>'], '']);
101
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1, fig. 1.1-2.1b]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, 1, fig. 1.1-2.1b"><span></span></sup>'], '']);
102
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1, fig. 1.1a-b]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, 1, fig. 1.1a-b"><span></span></sup>'], '']);
103
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1-2]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, 1-2"><span></span></sup>'], '']);
104
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1:1-2]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, 1:1-2"><span></span></sup>'], '']);
105
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1n]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, 1n"><span></span></sup>'], '']);
106
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1n1]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, 1n1"><span></span></sup>'], '']);
107
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, 1nn1-2]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, 1nn1-2"><span></span></sup>'], '']);
108
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, i]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, i"><span></span></sup>'], '']);
109
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, capter 1]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, capter 1"><span></span></sup>'], '']);
110
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020, cap. 1]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020, cap. 1"><span></span></sup>'], '']);
111
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020a]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020a"><span></span></sup>'], '']);
112
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020a, 1]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020a, 1"><span></span></sup>'], '']);
113
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020-2021a]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020-2021a"><span></span></sup>'], '']);
114
+ assert.deepStrictEqual(inspect(parser('[[^Xyz 2020-2021a, 1]]'), ctx), [['<sup class="reference" data-abbr="Xyz 2020-2021a, 1"><span></span></sup>'], '']);
115
+ assert.deepStrictEqual(inspect(parser('[[^Xyz, April 1, 2020]]'), ctx), [['<sup class="reference" data-abbr="Xyz, April 1, 2020"><span></span></sup>'], '']);
116
+ assert.deepStrictEqual(inspect(parser('[[^Xyz, April 1, 2020, 1]]'), ctx), [['<sup class="reference" data-abbr="Xyz, April 1, 2020, 1"><span></span></sup>'], '']);
117
+ assert.deepStrictEqual(inspect(parser('[[^Xyz n.d.]]'), ctx), [['<sup class="reference" data-abbr="Xyz n.d."><span></span></sup>'], '']);
118
+ assert.deepStrictEqual(inspect(parser('[[^Xyz n.d., 1]]'), ctx), [['<sup class="reference" data-abbr="Xyz n.d., 1"><span></span></sup>'], '']);
119
+ assert.deepStrictEqual(inspect(parser('[[^X. Y., and Z et al. 2020, 1-2]]'), ctx), [['<sup class="reference" data-abbr="X. Y., and Z et al. 2020, 1-2"><span></span></sup>'], '']);
120
+ assert.deepStrictEqual(inspect(parser('[[^^]]'), ctx), [['<sup class="invalid"><span>^^</span></sup>'], '']);
121
+ assert.deepStrictEqual(inspect(parser('[[\\^]]'), ctx), [['<sup class="reference"><span>^</span></sup>'], '']);
122
+ assert.deepStrictEqual(inspect(parser('[[^ ]]'), ctx), [['<sup class="invalid"><span>^</span></sup>'], '']);
123
+ assert.deepStrictEqual(inspect(parser('[[^ A]]'), ctx), [['<sup class="invalid"><span>^ A</span></sup>'], '']);
124
+ assert.deepStrictEqual(inspect(parser('[[^ |]]'), ctx), [['<sup class="invalid"><span>^ |</span></sup>'], '']);
125
+ assert.deepStrictEqual(inspect(parser('[[^ |b]]'), ctx), [['<sup class="invalid"><span>^ |b</span></sup>'], '']);
126
+ assert.deepStrictEqual(inspect(parser('[[^ | ]]'), ctx), [['<sup class="invalid"><span>^ |</span></sup>'], '']);
127
+ assert.deepStrictEqual(inspect(parser('[[^ | b]]'), ctx), [['<sup class="invalid"><span>^ | b</span></sup>'], '']);
126
128
  });
127
129
 
128
130
  });
@@ -1,6 +1,6 @@
1
1
  import { ReferenceParser } from '../inline';
2
2
  import { State, Backtrack, Command } from '../context';
3
- import { eval, exec } from '../../combinator/data/parser';
3
+ import { eval } from '../../combinator/data/parser';
4
4
  import { union, subsequence, some, precedence, state, constraint, surround, isBacktrack, setBacktrack, lazy } from '../../combinator';
5
5
  import { inline } from '../inline';
6
6
  import { textlink } from './link';
@@ -19,72 +19,73 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
19
19
  ]))),
20
20
  ']]',
21
21
  false,
22
- ([, ns], rest, context) => {
23
- if (context.linebreak === 0) {
24
- return [[html('sup', attributes(ns), [html('span', defrag(trimBlankNodeEnd(ns)))])], rest];
22
+ ([, ns], context) => {
23
+ const { position, range = 0, linebreak = 0 } = context;
24
+ if (linebreak === 0) {
25
+ return [[html('sup', attributes(ns), [html('span', defrag(trimBlankNodeEnd(ns)))])]];
25
26
  }
26
27
  else {
27
- const head = context.recent!.reduce((a, b) => a + b.length, rest.length);
28
+ const head = position - range;
28
29
  setBacktrack(context, [2 | Backtrack.link], head, 2);
29
30
  }
30
31
  },
31
- ([as, bs], rest, context) => {
32
- const { recent } = context;
33
- const head = recent!.reduce((a, b) => a + b.length, rest.length);
34
- if (rest[0] !== ']') {
32
+ ([as, bs], context) => {
33
+ if (!bs) return;
34
+ const { source, position, range = 0, linebreak = 0, state = 0 } = context;
35
+ const head = position - range;
36
+ if (source[position] !== ']') {
35
37
  setBacktrack(context, [2 | Backtrack.bracket], head, 2);
36
38
  }
37
- else if (context.linebreak! > 0) {
39
+ else if (linebreak !== 0) {
38
40
  setBacktrack(context, [2 | Backtrack.link], head, 2);
39
41
  }
40
42
  else {
41
- assert(rest[0] === ']');
42
- if (context.state! & State.annotation) {
43
- push(bs, [rest[0]]);
43
+ assert(source[position] === ']');
44
+ if (state & State.annotation) {
45
+ push(bs, [source[position]]);
44
46
  }
45
- const source = rest.slice(1);
47
+ context.position += 1;
46
48
  let result: ReturnType<typeof textlink>;
47
- if (source[0] !== '{') {
48
- setBacktrack(context, [2 | Backtrack.link], head - 1);
49
- result = [[], source];
49
+ if (source[context.position] !== '{') {
50
+ setBacktrack(context, [2 | Backtrack.link], head + 1);
51
+ result = [[]];
50
52
  }
51
53
  else {
52
- assert(source.length > 0);
53
- result = !isBacktrack(context, [1 | Backtrack.link], source)
54
- ? textlink({ source, context })
54
+ result = !isBacktrack(context, [1 | Backtrack.link])
55
+ ? textlink({ context })
55
56
  : undefined;
56
- context.recent = recent;
57
+ context.range = range;
57
58
  if (!result) {
58
- setBacktrack(context, [2 | Backtrack.link], head - 1);
59
- result = [[], source];
59
+ setBacktrack(context, [2 | Backtrack.link], head + 1);
60
+ result = [[]];
60
61
  }
61
62
  }
62
63
  assert(result);
63
- if (exec(result) === '') {
64
+ if (context.position === source.length) {
64
65
  setBacktrack(context, [2 | Backtrack.link], head);
65
66
  }
66
67
  else {
67
- assert(context.state! ^ State.link);
68
+ assert(state ^ State.link);
68
69
  const next = surround(
69
70
  '',
70
71
  some(inline, ']', [[']', 1]]),
71
72
  str(']'),
72
73
  true,
73
- ([, cs = [], ds], rest) =>
74
- [push(cs, ds), rest],
75
- ([, cs = []], rest) => {
74
+ ([, cs = [], ds]) =>
75
+ [push(cs, ds)],
76
+ ([, cs = []]) => {
76
77
  setBacktrack(context, [2 | Backtrack.link], head);
77
- return [cs, rest];
78
+ return [cs];
78
79
  })
79
- ({ source: exec(result), context });
80
- if (context.state! & State.annotation && next) {
81
- push(push(bs, eval(result)), eval(next));
82
- rest = exec(next);
80
+ ({ context });
81
+ if (state & State.annotation && next) {
82
+ return [push(push(unshift(as, bs), eval(result)), eval(next))];
83
83
  }
84
84
  }
85
+ context.position = position;
85
86
  }
86
- return context.state! & State.annotation
87
- ? [unshift(as, bs), rest]
87
+ return state & State.annotation
88
+ ? [unshift(as, bs)]
88
89
  : undefined;
89
90
  },
90
91
  [3 | Backtrack.doublebracket, 1 | Backtrack.bracket])));
@@ -93,16 +94,24 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
93
94
  const abbr: ReferenceParser.AbbrParser = surround(
94
95
  str('^'),
95
96
  union([str(/^(?=[A-Z])(?:[0-9A-Za-z]'?|(?:[-.:]|\.?\??,? ?)(?!['\-.:?, ]))+/)]),
96
- /^\|?(?=]])|^\|[^\S\n]*/,
97
+ /^\|?(?=]])|^\|/,
97
98
  true,
98
- ([, ns], rest) => ns ? [[Command.Escape, ns[0].trimEnd()], rest.replace(blank.start, '')] : [[''], `^${rest}`],
99
- ([as, bs = ['']], rest) => [[''], as[0] + bs[0] + rest]);
99
+ ([, ns], context) => {
100
+ const { source, position, range = 0 } = context;
101
+ if (!ns) return [['', source.slice(position - range, source[position - 1] === '|' ? position - 1 : position)]];
102
+ context.position += source.slice(position).match(blank.start)?.[0].length ?? 0;
103
+ return [[Command.Separator, ns[0].trimEnd()]];
104
+ },
105
+ (_, context) => {
106
+ context.position -= context.range!;
107
+ return [['']];
108
+ });
100
109
 
101
110
  function attributes(ns: (string | HTMLElement)[]): Record<string, string | undefined> {
102
111
  switch (ns[0]) {
103
112
  case '':
104
113
  return { class: 'invalid', ...invalid('reference', 'syntax', 'Invalid abbreviation') };
105
- case Command.Escape:
114
+ case Command.Separator:
106
115
  const abbr = ns[1] as string;
107
116
  ns[0] = ns[1] = '';
108
117
  return { class: 'reference', 'data-abbr': abbr };
@@ -1,65 +1,67 @@
1
1
  import { remark } from './remark';
2
2
  import { some } from '../../combinator';
3
+ import { input } from '../../combinator/data/parser';
3
4
  import { inspect } from '../../debug.test';
4
5
 
5
6
  describe('Unit: parser/inline/remark', () => {
6
7
  describe('remark', () => {
7
- const parser = (source: string) => some(remark)({ source, context: {} });
8
+ const parser = (source: string) => some(remark)(input(source, ctx));
9
+ const { context: ctx } = input('', {});
8
10
 
9
11
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('')), undefined);
11
- assert.deepStrictEqual(inspect(parser('<')), undefined);
12
- assert.deepStrictEqual(inspect(parser('[%')), undefined);
13
- assert.deepStrictEqual(inspect(parser('[%[%')), undefined);
14
- assert.deepStrictEqual(inspect(parser('[%a%]')), undefined);
15
- assert.deepStrictEqual(inspect(parser('[%a b%]')), undefined);
16
- assert.deepStrictEqual(inspect(parser('[% ')), [['[%'], '']);
17
- assert.deepStrictEqual(inspect(parser('[% \n a')), [['[%', '<br>', ' ', 'a'], '']);
18
- assert.deepStrictEqual(inspect(parser('[%%]')), undefined);
19
- assert.deepStrictEqual(inspect(parser('[% [%')), [['[%', ' ', '[', '%'], '']);
20
- assert.deepStrictEqual(inspect(parser('[% [% ')), [['[%', ' ', '[%'], '']);
21
- assert.deepStrictEqual(inspect(parser('[% [% a')), [['[%', ' ', '[%', ' ', 'a'], '']);
22
- assert.deepStrictEqual(inspect(parser('[% [% a %]')), [['[%', ' ', '<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], '']);
23
- assert.deepStrictEqual(inspect(parser('[% a[%')), [['[%', ' ', 'a', '[', '%'], '']);
24
- assert.deepStrictEqual(inspect(parser('[% a [%')), [['[%', ' ', 'a', ' ', '[', '%'], '']);
25
- assert.deepStrictEqual(inspect(parser('[% a [% ')), [['[%', ' ', 'a', ' ', '[%'], '']);
26
- assert.deepStrictEqual(inspect(parser('[% a [% b')), [['[%', ' ', 'a', ' ', '[%', ' ', 'b'], '']);
27
- assert.deepStrictEqual(inspect(parser('[% a [%% b')), [['[%', ' ', 'a', ' ', '[%%', ' ', 'b'], '']);
28
- assert.deepStrictEqual(inspect(parser('[%% a [% b')), [['[%%', ' ', 'a', ' ', '[%', ' ', 'b'], '']);
29
- assert.deepStrictEqual(inspect(parser('[%\\ a %]')), undefined);
30
- assert.deepStrictEqual(inspect(parser('[% a\\ %]')), [['[%', ' ', 'a', ' ', '%', ']'], '']);
31
- assert.deepStrictEqual(inspect(parser('[% a%]')), [['[%', ' ', 'a', '%', ']'], '']);
32
- assert.deepStrictEqual(inspect(parser('[% a %%]')), [['[%', ' ', 'a', ' ', '%', '%', ']'], '']);
33
- assert.deepStrictEqual(inspect(parser('[% [%% %]')), [['[%', ' ', '[%%', ' ', '%', ']'], '']);
34
- assert.deepStrictEqual(inspect(parser('[%% [% %%]')), [['[%%', ' ', '[%', ' ', '%', '%', ']'], '']);
35
- assert.deepStrictEqual(inspect(parser('[%% a %]')), [['[%%', ' ', 'a', ' ', '%', ']'], '']);
36
- assert.deepStrictEqual(inspect(parser(' [% a %]')), undefined);
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('[%[%'), ctx), undefined);
16
+ assert.deepStrictEqual(inspect(parser('[%a%]'), ctx), undefined);
17
+ assert.deepStrictEqual(inspect(parser('[%a b%]'), ctx), undefined);
18
+ assert.deepStrictEqual(inspect(parser('[% '), ctx), [['[%', ' '], '']);
19
+ assert.deepStrictEqual(inspect(parser('[% \n a'), ctx), [['[%', ' ', '<br>', ' ', 'a'], '']);
20
+ assert.deepStrictEqual(inspect(parser('[%%]'), ctx), undefined);
21
+ assert.deepStrictEqual(inspect(parser('[% [%'), ctx), [['[%', ' ', '[', '%'], '']);
22
+ assert.deepStrictEqual(inspect(parser('[% [% '), ctx), [['[%', ' ', '[%', ' '], '']);
23
+ assert.deepStrictEqual(inspect(parser('[% [% a'), ctx), [['[%', ' ', '[%', ' ', 'a'], '']);
24
+ assert.deepStrictEqual(inspect(parser('[% [% a %]'), ctx), [['[%', ' ', '<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], '']);
25
+ assert.deepStrictEqual(inspect(parser('[% a[%'), ctx), [['[%', ' ', 'a', '[', '%'], '']);
26
+ assert.deepStrictEqual(inspect(parser('[% a [%'), ctx), [['[%', ' ', 'a', ' ', '[', '%'], '']);
27
+ assert.deepStrictEqual(inspect(parser('[% a [% '), ctx), [['[%', ' ', 'a', ' ', '[%', ' '], '']);
28
+ assert.deepStrictEqual(inspect(parser('[% a [% b'), ctx), [['[%', ' ', 'a', ' ', '[%', ' ', 'b'], '']);
29
+ assert.deepStrictEqual(inspect(parser('[% a [%% b'), ctx), [['[%', ' ', 'a', ' ', '[%%', ' ', 'b'], '']);
30
+ assert.deepStrictEqual(inspect(parser('[%% a [% b'), ctx), [['[%%', ' ', 'a', ' ', '[%', ' ', 'b'], '']);
31
+ assert.deepStrictEqual(inspect(parser('[%\\ a %]'), ctx), undefined);
32
+ assert.deepStrictEqual(inspect(parser('[% a\\ %]'), ctx), [['[%', ' ', 'a', ' ', '%', ']'], '']);
33
+ assert.deepStrictEqual(inspect(parser('[% a%]'), ctx), [['[%', ' ', 'a', '%', ']'], '']);
34
+ assert.deepStrictEqual(inspect(parser('[% a %%]'), ctx), [['[%', ' ', 'a', ' ', '%', '%', ']'], '']);
35
+ assert.deepStrictEqual(inspect(parser('[% [%% %]'), ctx), [['[%', ' ', '[%%', ' ', '%', ']'], '']);
36
+ assert.deepStrictEqual(inspect(parser('[%% [% %%]'), ctx), [['[%%', ' ', '[%', ' ', '%', '%', ']'], '']);
37
+ assert.deepStrictEqual(inspect(parser('[%% a %]'), ctx), [['[%%', ' ', 'a', ' ', '%', ']'], '']);
38
+ assert.deepStrictEqual(inspect(parser(' [% a %]'), ctx), undefined);
37
39
  });
38
40
 
39
41
  it('basic', () => {
40
- assert.deepStrictEqual(inspect(parser('[% %]')), [['<span class="remark"><input type="checkbox"><span>[% %]</span></span>'], '']);
41
- assert.deepStrictEqual(inspect(parser('[% %]')), [['<span class="remark"><input type="checkbox"><span>[% %]</span></span>'], '']);
42
- assert.deepStrictEqual(inspect(parser('[% %]')), [['<span class="remark"><input type="checkbox"><span>[% %]</span></span>'], '']);
43
- assert.deepStrictEqual(inspect(parser('[% a %]')), [['<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], '']);
44
- assert.deepStrictEqual(inspect(parser('[% a %]')), [['<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], '']);
45
- assert.deepStrictEqual(inspect(parser('[% a b %]')), [['<span class="remark"><input type="checkbox"><span>[% a b %]</span></span>'], '']);
46
- assert.deepStrictEqual(inspect(parser('[% a\nb %]')), [['<span class="remark"><input type="checkbox"><span>[% a<br>b %]</span></span>'], '']);
47
- assert.deepStrictEqual(inspect(parser('[% a %] %]')), [['<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], ' %]']);
48
- assert.deepStrictEqual(inspect(parser('[% %%] %]')), [['<span class="remark"><input type="checkbox"><span>[% %%] %]</span></span>'], '']);
49
- assert.deepStrictEqual(inspect(parser('[% [% a %] %]')), [['<span class="remark"><input type="checkbox"><span>[% <span class="remark"><input type="checkbox"><span>[% a %]</span></span> %]</span></span>'], '']);
50
- assert.deepStrictEqual(inspect(parser('[% [%% a %%] %]')), [['<span class="remark"><input type="checkbox"><span>[% <span class="remark"><input type="checkbox"><span>[%% a %%]</span></span> %]</span></span>'], '']);
51
- assert.deepStrictEqual(inspect(parser('[%% a %%]')), [['<span class="remark"><input type="checkbox"><span>[%% a %%]</span></span>'], '']);
52
- assert.deepStrictEqual(inspect(parser('[%% %] %%]')), [['<span class="remark"><input type="checkbox"><span>[%% %] %%]</span></span>'], '']);
53
- assert.deepStrictEqual(inspect(parser('[%% [% a %] %%]')), [['<span class="remark"><input type="checkbox"><span>[%% <span class="remark"><input type="checkbox"><span>[% a %]</span></span> %%]</span></span>'], '']);
54
- assert.deepStrictEqual(inspect(parser('[% a %]b')), [['<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], 'b']);
55
- assert.deepStrictEqual(inspect(parser('[%\na\n%]')), [['<span class="remark"><input type="checkbox"><span>[%<br>a<br>%]</span></span>'], '']);
56
- assert.deepStrictEqual(inspect(parser('[% &a; %]')), [['<span class="remark"><input type="checkbox"><span>[% <span class="invalid">&amp;a;</span> %]</span></span>'], '']);
57
- assert.deepStrictEqual(inspect(parser('[% &copy; %]')), [['<span class="remark"><input type="checkbox"><span>[% © %]</span></span>'], '']);
58
- assert.deepStrictEqual(inspect(parser('[% &amp;copy; %]')), [['<span class="remark"><input type="checkbox"><span>[% &amp;copy; %]</span></span>'], '']);
59
- assert.deepStrictEqual(inspect(parser('[% [ %]')), [['<span class="remark"><input type="checkbox"><span>[% [ %]</span></span>'], '']);
60
- assert.deepStrictEqual(inspect(parser('[% \\ a %]')), [['<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], '']);
61
- assert.deepStrictEqual(inspect(parser('[% $-a %]$')), [['<span class="remark"><input type="checkbox"><span>[% <a class="label" data-label="$-a">$-a</a> %]</span></span>'], '$']);
62
- assert.deepStrictEqual(inspect(parser('[% <bdi> %]')), [['<span class="remark"><input type="checkbox"><span>[% <span class="invalid">&lt;bdi&gt;</span> %]</span></span>'], '']);
42
+ assert.deepStrictEqual(inspect(parser('[% %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% %]</span></span>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('[% %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% %]</span></span>'], '']);
44
+ assert.deepStrictEqual(inspect(parser('[% %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% %]</span></span>'], '']);
45
+ assert.deepStrictEqual(inspect(parser('[% a %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], '']);
46
+ assert.deepStrictEqual(inspect(parser('[% a %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], '']);
47
+ assert.deepStrictEqual(inspect(parser('[% a b %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% a b %]</span></span>'], '']);
48
+ assert.deepStrictEqual(inspect(parser('[% a\nb %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% a<br>b %]</span></span>'], '']);
49
+ assert.deepStrictEqual(inspect(parser('[% a %] %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], ' %]']);
50
+ assert.deepStrictEqual(inspect(parser('[% %%] %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% %%] %]</span></span>'], '']);
51
+ assert.deepStrictEqual(inspect(parser('[% [% a %] %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% <span class="remark"><input type="checkbox"><span>[% a %]</span></span> %]</span></span>'], '']);
52
+ assert.deepStrictEqual(inspect(parser('[% [%% a %%] %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% <span class="remark"><input type="checkbox"><span>[%% a %%]</span></span> %]</span></span>'], '']);
53
+ assert.deepStrictEqual(inspect(parser('[%% a %%]'), ctx), [['<span class="remark"><input type="checkbox"><span>[%% a %%]</span></span>'], '']);
54
+ assert.deepStrictEqual(inspect(parser('[%% %] %%]'), ctx), [['<span class="remark"><input type="checkbox"><span>[%% %] %%]</span></span>'], '']);
55
+ assert.deepStrictEqual(inspect(parser('[%% [% a %] %%]'), ctx), [['<span class="remark"><input type="checkbox"><span>[%% <span class="remark"><input type="checkbox"><span>[% a %]</span></span> %%]</span></span>'], '']);
56
+ assert.deepStrictEqual(inspect(parser('[% a %]b'), ctx), [['<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], 'b']);
57
+ assert.deepStrictEqual(inspect(parser('[%\na\n%]'), ctx), [['<span class="remark"><input type="checkbox"><span>[%<br>a<br>%]</span></span>'], '']);
58
+ assert.deepStrictEqual(inspect(parser('[% &a; %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% <span class="invalid">&amp;a;</span> %]</span></span>'], '']);
59
+ assert.deepStrictEqual(inspect(parser('[% &copy; %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% © %]</span></span>'], '']);
60
+ assert.deepStrictEqual(inspect(parser('[% &amp;copy; %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% &amp;copy; %]</span></span>'], '']);
61
+ assert.deepStrictEqual(inspect(parser('[% [ %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% [ %]</span></span>'], '']);
62
+ assert.deepStrictEqual(inspect(parser('[% \\ a %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% a %]</span></span>'], '']);
63
+ assert.deepStrictEqual(inspect(parser('[% $-a %]$'), ctx), [['<span class="remark"><input type="checkbox"><span>[% <a class="label" data-label="$-a">$-a</a> %]</span></span>'], '$']);
64
+ assert.deepStrictEqual(inspect(parser('[% <bdi> %]'), ctx), [['<span class="remark"><input type="checkbox"><span>[% <span class="invalid">&lt;bdi&gt;</span> %]</span></span>'], '']);
63
65
  });
64
66
 
65
67
  });
@@ -16,11 +16,11 @@ export const remark: RemarkParser = lazy(() => match(
16
16
  precedence(4, recursion(Recursion.inline,
17
17
  some(union([inline]), new RegExp(String.raw`^\s+${fence}\]`), [[new RegExp(String.raw`^\s+${fence}\]`), 4]]))),
18
18
  close(some(text, '%'), str(`${fence}]`)), true,
19
- ([as, bs = [], cs], rest) => [[
19
+ ([as, bs = [], cs]) => [[
20
20
  html('span', { class: 'remark' }, [
21
21
  html('input', { type: 'checkbox' }),
22
22
  html('span', defrag(push(unshift(as, bs), cs))),
23
23
  ]),
24
- ], rest],
25
- ([as, bs = []], rest) => [unshift(as, bs), rest]),
24
+ ]],
25
+ ([as, bs]) => bs && [unshift(as, bs)]),
26
26
  ([, fence]) => fence.length, {})));