securemark 0.299.3 → 0.300.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (241) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/design.md +0 -6
  3. package/dist/index.js +3479 -2750
  4. package/index.d.ts +2 -1
  5. package/index.ts +2 -2
  6. package/markdown.d.ts +209 -183
  7. package/package.json +1 -1
  8. package/src/{parser/api → api}/bind.test.ts +2 -24
  9. package/src/{parser/api → api}/bind.ts +18 -13
  10. package/src/{parser/api → api}/body.test.ts +1 -1
  11. package/src/{parser/api → api}/cache.ts +1 -1
  12. package/src/{parser/api → api}/header.test.ts +1 -1
  13. package/src/{parser/api → api}/header.ts +9 -6
  14. package/src/{parser/api → api}/normalize.test.ts +1 -1
  15. package/src/{parser/api → api}/parse.test.ts +120 -124
  16. package/src/api/parse.ts +30 -0
  17. package/src/api/run.ts +6 -0
  18. package/src/{parser/api.ts → api.ts} +1 -0
  19. package/src/combinator/control/inits.ts +26 -0
  20. package/src/combinator/control/sequence.test.ts +38 -0
  21. package/src/combinator/control/sequence.ts +17 -0
  22. package/src/combinator/control/some.test.ts +41 -0
  23. package/src/combinator/{data/parser → control}/some.ts +39 -26
  24. package/src/combinator/control/state.ts +42 -0
  25. package/src/combinator/control/subsequence.test.ts +47 -0
  26. package/src/combinator/control/subsequence.ts +16 -0
  27. package/src/combinator/control/tails.ts +8 -0
  28. package/src/combinator/control/union.test.ts +37 -0
  29. package/src/combinator/control/union.ts +18 -0
  30. package/src/combinator/{data/delimiter.ts → delimiter.ts} +40 -60
  31. package/src/combinator/effect/backtrack.ts +64 -0
  32. package/src/combinator/effect/clock.ts +10 -0
  33. package/src/combinator/effect/precedence.ts +50 -0
  34. package/src/combinator/effect/recursion.ts +30 -0
  35. package/src/combinator/effect/scope.ts +100 -0
  36. package/src/combinator/effect/state.ts +72 -0
  37. package/src/combinator/{data/node.ts → parser/list.ts} +38 -13
  38. package/src/combinator/parser.ts +293 -0
  39. package/src/combinator/process/bind.ts +34 -0
  40. package/src/combinator/process/block.test.ts +20 -0
  41. package/src/combinator/process/block.ts +33 -0
  42. package/src/combinator/process/clear.ts +16 -0
  43. package/src/combinator/process/contract.ts +35 -0
  44. package/src/combinator/process/duplicate.ts +7 -0
  45. package/src/combinator/process/error.ts +13 -0
  46. package/src/combinator/{control/manipulation → process}/fallback.ts +3 -3
  47. package/src/combinator/process/fence.ts +59 -0
  48. package/src/combinator/process/fmap.ts +10 -0
  49. package/src/combinator/process/indent.test.ts +31 -0
  50. package/src/combinator/process/indent.ts +51 -0
  51. package/src/combinator/process/lazy.ts +8 -0
  52. package/src/combinator/process/line.test.ts +21 -0
  53. package/src/combinator/process/line.ts +55 -0
  54. package/src/combinator/process/match.ts +37 -0
  55. package/src/combinator/process/reverse.ts +7 -0
  56. package/src/combinator/process/scope.ts +102 -0
  57. package/src/combinator/process/surround.ts +271 -0
  58. package/src/combinator.ts +28 -24
  59. package/src/debug.test.ts +11 -8
  60. package/src/parser/autolink.test.ts +17 -18
  61. package/src/parser/block/blockquote.test.ts +78 -79
  62. package/src/parser/block/blockquote.ts +32 -25
  63. package/src/parser/block/codeblock.test.ts +56 -57
  64. package/src/parser/block/codeblock.ts +44 -26
  65. package/src/parser/block/dlist.test.ts +56 -57
  66. package/src/parser/block/dlist.ts +5 -5
  67. package/src/parser/block/extension/aside.test.ts +8 -9
  68. package/src/parser/block/extension/aside.ts +76 -47
  69. package/src/parser/block/extension/example.test.ts +18 -19
  70. package/src/parser/block/extension/example.ts +88 -48
  71. package/src/parser/block/extension/fig.test.ts +37 -36
  72. package/src/parser/block/extension/fig.ts +20 -25
  73. package/src/parser/block/extension/figbase.test.ts +18 -19
  74. package/src/parser/block/extension/figbase.ts +3 -3
  75. package/src/parser/block/extension/figure.test.ts +62 -63
  76. package/src/parser/block/extension/figure.ts +23 -21
  77. package/src/parser/block/extension/message.test.ts +13 -14
  78. package/src/parser/block/extension/message.ts +52 -39
  79. package/src/parser/block/extension/placeholder.test.ts +13 -13
  80. package/src/parser/block/extension/placeholder.ts +23 -21
  81. package/src/parser/block/extension/table.test.ts +70 -71
  82. package/src/parser/block/extension/table.ts +43 -31
  83. package/src/parser/block/extension.test.ts +24 -24
  84. package/src/parser/block/extension.ts +3 -3
  85. package/src/parser/block/heading.test.ts +58 -59
  86. package/src/parser/block/heading.ts +19 -18
  87. package/src/parser/block/ilist.test.ts +8 -8
  88. package/src/parser/block/ilist.ts +9 -7
  89. package/src/parser/block/mathblock.test.ts +31 -32
  90. package/src/parser/block/mathblock.ts +24 -23
  91. package/src/parser/block/mediablock.ts +7 -7
  92. package/src/parser/block/olist.test.ts +102 -103
  93. package/src/parser/block/olist.ts +11 -12
  94. package/src/parser/block/pagebreak.test.ts +15 -16
  95. package/src/parser/block/pagebreak.ts +5 -5
  96. package/src/parser/block/paragraph.test.ts +57 -58
  97. package/src/parser/block/paragraph.ts +1 -1
  98. package/src/parser/block/reply/cite.test.ts +39 -40
  99. package/src/parser/block/reply/cite.ts +5 -5
  100. package/src/parser/block/reply/quote.test.ts +50 -51
  101. package/src/parser/block/reply/quote.ts +8 -7
  102. package/src/parser/block/reply.test.ts +19 -20
  103. package/src/parser/block/reply.ts +2 -2
  104. package/src/parser/block/sidefence.test.ts +41 -48
  105. package/src/parser/block/sidefence.ts +17 -11
  106. package/src/parser/block/table.test.ts +48 -49
  107. package/src/parser/block/table.ts +10 -9
  108. package/src/parser/block/ulist.test.ts +52 -53
  109. package/src/parser/block/ulist.ts +9 -8
  110. package/src/parser/block.ts +63 -51
  111. package/src/parser/context.ts +35 -32
  112. package/src/parser/document.ts +48 -0
  113. package/src/parser/header.test.ts +19 -20
  114. package/src/parser/header.ts +31 -25
  115. package/src/parser/inline/annotation.test.ts +49 -50
  116. package/src/parser/inline/annotation.ts +14 -16
  117. package/src/parser/inline/autolink/account.test.ts +32 -33
  118. package/src/parser/inline/autolink/account.ts +18 -19
  119. package/src/parser/inline/autolink/anchor.test.ts +21 -22
  120. package/src/parser/inline/autolink/anchor.ts +7 -8
  121. package/src/parser/inline/autolink/channel.test.ts +14 -15
  122. package/src/parser/inline/autolink/email.test.ts +36 -37
  123. package/src/parser/inline/autolink/email.ts +6 -6
  124. package/src/parser/inline/autolink/hashnum.test.ts +32 -33
  125. package/src/parser/inline/autolink/hashnum.ts +7 -8
  126. package/src/parser/inline/autolink/hashtag.test.ts +59 -60
  127. package/src/parser/inline/autolink/hashtag.ts +8 -9
  128. package/src/parser/inline/autolink/url.test.ts +75 -76
  129. package/src/parser/inline/autolink/url.ts +13 -14
  130. package/src/parser/inline/autolink.ts +24 -11
  131. package/src/parser/inline/bracket.test.ts +73 -74
  132. package/src/parser/inline/bracket.ts +88 -63
  133. package/src/parser/inline/code.test.ts +30 -31
  134. package/src/parser/inline/code.ts +6 -6
  135. package/src/parser/inline/deletion.test.ts +27 -28
  136. package/src/parser/inline/deletion.ts +5 -5
  137. package/src/parser/inline/emphasis.test.ts +39 -40
  138. package/src/parser/inline/emphasis.ts +5 -5
  139. package/src/parser/inline/emstrong.test.ts +101 -102
  140. package/src/parser/inline/emstrong.ts +103 -85
  141. package/src/parser/inline/extension/index.test.ts +91 -92
  142. package/src/parser/inline/extension/index.ts +17 -13
  143. package/src/parser/inline/extension/indexee.ts +4 -4
  144. package/src/parser/inline/extension/indexer.test.ts +23 -24
  145. package/src/parser/inline/extension/indexer.ts +6 -5
  146. package/src/parser/inline/extension/label.test.ts +32 -33
  147. package/src/parser/inline/extension/label.ts +14 -5
  148. package/src/parser/inline/extension/placeholder.test.ts +42 -43
  149. package/src/parser/inline/extension/placeholder.ts +8 -9
  150. package/src/parser/inline/html.test.ts +109 -109
  151. package/src/parser/inline/html.ts +27 -27
  152. package/src/parser/inline/htmlentity.test.ts +37 -38
  153. package/src/parser/inline/htmlentity.ts +6 -7
  154. package/src/parser/inline/insertion.test.ts +27 -28
  155. package/src/parser/inline/insertion.ts +5 -5
  156. package/src/parser/inline/italic.test.ts +55 -56
  157. package/src/parser/inline/italic.ts +5 -5
  158. package/src/parser/inline/link.test.ts +186 -187
  159. package/src/parser/inline/link.ts +31 -32
  160. package/src/parser/inline/mark.test.ts +31 -32
  161. package/src/parser/inline/mark.ts +6 -6
  162. package/src/parser/inline/math.test.ts +140 -141
  163. package/src/parser/inline/math.ts +6 -7
  164. package/src/parser/inline/media.test.ts +92 -93
  165. package/src/parser/inline/media.ts +32 -38
  166. package/src/parser/inline/reference.test.ts +111 -112
  167. package/src/parser/inline/reference.ts +61 -32
  168. package/src/parser/inline/remark.test.ts +49 -50
  169. package/src/parser/inline/remark.ts +13 -13
  170. package/src/parser/inline/ruby.test.ts +49 -50
  171. package/src/parser/inline/ruby.ts +60 -49
  172. package/src/parser/inline/shortmedia.test.ts +9 -10
  173. package/src/parser/inline/shortmedia.ts +11 -9
  174. package/src/parser/inline/strong.test.ts +36 -37
  175. package/src/parser/inline/strong.ts +5 -5
  176. package/src/parser/inline/template.test.ts +22 -23
  177. package/src/parser/inline/template.ts +13 -16
  178. package/src/parser/inline.test.ts +225 -226
  179. package/src/parser/inline.ts +68 -34
  180. package/src/parser/node.ts +1 -1
  181. package/src/parser/parser.ts +51 -0
  182. package/src/parser/repeat.ts +118 -91
  183. package/src/parser/segment.test.ts +0 -11
  184. package/src/parser/segment.ts +25 -28
  185. package/src/parser/source/escapable.test.ts +23 -24
  186. package/src/parser/source/escapable.ts +20 -20
  187. package/src/parser/source/line.test.ts +17 -18
  188. package/src/parser/source/line.ts +19 -24
  189. package/src/parser/source/str.ts +17 -10
  190. package/src/parser/source/text.test.ts +88 -89
  191. package/src/parser/source/text.ts +19 -20
  192. package/src/parser/source/unescapable.test.ts +23 -24
  193. package/src/parser/source/unescapable.ts +16 -16
  194. package/src/parser/util.ts +1 -1
  195. package/src/parser/visibility.ts +36 -15
  196. package/src/{parser/processor → processor}/figure.test.ts +23 -23
  197. package/src/{parser/processor → processor}/figure.ts +20 -12
  198. package/src/{parser/processor → processor}/note.test.ts +15 -15
  199. package/src/{parser/processor → processor}/note.ts +6 -4
  200. package/src/renderer/render/media/pdf.ts +2 -2
  201. package/src/renderer/render/media/twitter.ts +2 -2
  202. package/src/renderer/render/media.test.ts +12 -13
  203. package/src/renderer/render.test.ts +11 -11
  204. package/src/util/info.test.ts +2 -2
  205. package/src/util/quote.test.ts +3 -3
  206. package/src/util/quote.ts +6 -5
  207. package/src/util/toc.test.ts +12 -12
  208. package/src/combinator/control/constraint/block.test.ts +0 -20
  209. package/src/combinator/control/constraint/block.ts +0 -28
  210. package/src/combinator/control/constraint/contract.ts +0 -27
  211. package/src/combinator/control/constraint/line.test.ts +0 -21
  212. package/src/combinator/control/constraint/line.ts +0 -42
  213. package/src/combinator/control/manipulation/clear.ts +0 -5
  214. package/src/combinator/control/manipulation/convert.ts +0 -22
  215. package/src/combinator/control/manipulation/duplicate.ts +0 -7
  216. package/src/combinator/control/manipulation/fence.ts +0 -54
  217. package/src/combinator/control/manipulation/indent.test.ts +0 -31
  218. package/src/combinator/control/manipulation/indent.ts +0 -39
  219. package/src/combinator/control/manipulation/lazy.ts +0 -8
  220. package/src/combinator/control/manipulation/match.ts +0 -27
  221. package/src/combinator/control/manipulation/recovery.ts +0 -18
  222. package/src/combinator/control/manipulation/reverse.ts +0 -8
  223. package/src/combinator/control/manipulation/scope.ts +0 -61
  224. package/src/combinator/control/manipulation/surround.ts +0 -223
  225. package/src/combinator/control/monad/bind.ts +0 -26
  226. package/src/combinator/control/monad/fmap.ts +0 -10
  227. package/src/combinator/data/parser/context.ts +0 -96
  228. package/src/combinator/data/parser/inits.ts +0 -20
  229. package/src/combinator/data/parser/sequence.test.ts +0 -33
  230. package/src/combinator/data/parser/sequence.ts +0 -20
  231. package/src/combinator/data/parser/some.test.ts +0 -37
  232. package/src/combinator/data/parser/subsequence.test.ts +0 -41
  233. package/src/combinator/data/parser/subsequence.ts +0 -13
  234. package/src/combinator/data/parser/tails.ts +0 -8
  235. package/src/combinator/data/parser/union.test.ts +0 -33
  236. package/src/combinator/data/parser/union.ts +0 -18
  237. package/src/combinator/data/parser.ts +0 -144
  238. package/src/parser/api/parse.ts +0 -48
  239. package/src/parser.ts +0 -1
  240. /package/src/{parser/api → api}/body.ts +0 -0
  241. /package/src/{parser/api → api}/normalize.ts +0 -0
@@ -1,7 +1,6 @@
1
1
  import { emstrong } from './emstrong';
2
2
  import { some } from '../../combinator';
3
- import { input } from '../../combinator/data/parser';
4
- import { Context } from '../context';
3
+ import { input } from '../context';
5
4
  import { inspect } from '../../debug.test';
6
5
 
7
6
  describe('Unit: parser/inline/emstrong', () => {
@@ -9,112 +8,112 @@ describe('Unit: parser/inline/emstrong', () => {
9
8
  const parser = some(emstrong);
10
9
 
11
10
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser, input('***', new Context())), [['***'], '']);
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('*** ***', new Context())), undefined);
20
- assert.deepStrictEqual(inspect(parser, input('*** a***', new Context())), undefined);
21
- assert.deepStrictEqual(inspect(parser, input('*** a ***', new Context())), undefined);
22
- assert.deepStrictEqual(inspect(parser, input('***\n***', new Context())), undefined);
23
- assert.deepStrictEqual(inspect(parser, input('***\na***', new Context())), undefined);
24
- assert.deepStrictEqual(inspect(parser, input('***\\ a***', new Context())), undefined);
25
- assert.deepStrictEqual(inspect(parser, input('***\\\na***', new Context())), undefined);
26
- assert.deepStrictEqual(inspect(parser, input('***<wbr>a***', new Context())), undefined);
27
- assert.deepStrictEqual(inspect(parser, input(' ***a***', new Context())), undefined);
11
+ assert.deepStrictEqual(inspect(parser, input('***')), [['***'], '']);
12
+ assert.deepStrictEqual(inspect(parser, input('***a')), [['***a'], '']);
13
+ assert.deepStrictEqual(inspect(parser, input('***a ***')), [['***a ', '***'], '']);
14
+ assert.deepStrictEqual(inspect(parser, input('***a ***')), [['***a', ' ', '***'], '']);
15
+ assert.deepStrictEqual(inspect(parser, input('***a\n***')), [['***a', '<br>', '***'], '']);
16
+ assert.deepStrictEqual(inspect(parser, input('***a\\ ***')), [['***a', ' ', '***'], '']);
17
+ assert.deepStrictEqual(inspect(parser, input('***a\\\n***')), [['***a', '<br>', '***'], '']);
18
+ assert.deepStrictEqual(inspect(parser, input('*** ***')), undefined);
19
+ assert.deepStrictEqual(inspect(parser, input('*** a***')), undefined);
20
+ assert.deepStrictEqual(inspect(parser, input('*** a ***')), undefined);
21
+ assert.deepStrictEqual(inspect(parser, input('***\n***')), undefined);
22
+ assert.deepStrictEqual(inspect(parser, input('***\na***')), undefined);
23
+ assert.deepStrictEqual(inspect(parser, input('***\\ a***')), undefined);
24
+ assert.deepStrictEqual(inspect(parser, input('***\\\na***')), undefined);
25
+ assert.deepStrictEqual(inspect(parser, input('***<wbr>a***')), undefined);
26
+ assert.deepStrictEqual(inspect(parser, input(' ***a***')), undefined);
28
27
  });
29
28
 
30
29
  it('basic', () => {
31
- assert.deepStrictEqual(inspect(parser, input('***a***', new Context())), [['<em><strong>a</strong></em>'], '']);
32
- assert.deepStrictEqual(inspect(parser, input('***ab***', new Context())), [['<em><strong>ab</strong></em>'], '']);
33
- assert.deepStrictEqual(inspect(parser, input('***a****', new Context())), [['<em><strong>a</strong></em>'], '*']);
34
- assert.deepStrictEqual(inspect(parser, input('***a\nb***', new Context())), [['<em><strong>a<br>b</strong></em>'], '']);
35
- assert.deepStrictEqual(inspect(parser, input('***a\\\nb***', new Context())), [['<em><strong>a<br>b</strong></em>'], '']);
30
+ assert.deepStrictEqual(inspect(parser, input('***a***')), [['<em><strong>a</strong></em>'], '']);
31
+ assert.deepStrictEqual(inspect(parser, input('***ab***')), [['<em><strong>ab</strong></em>'], '']);
32
+ assert.deepStrictEqual(inspect(parser, input('***a****')), [['<em><strong>a</strong></em>'], '*']);
33
+ assert.deepStrictEqual(inspect(parser, input('***a\nb***')), [['<em><strong>a<br>b</strong></em>'], '']);
34
+ assert.deepStrictEqual(inspect(parser, input('***a\\\nb***')), [['<em><strong>a<br>b</strong></em>'], '']);
36
35
  });
37
36
 
38
37
  it('nest', () => {
39
- assert.deepStrictEqual(inspect(parser, input('***`a`***', new Context())), [['<em><strong><code data-src="`a`">a</code></strong></em>'], '']);
40
- assert.deepStrictEqual(inspect(parser, input('***(*a*)***', new Context())), [['<em><strong><span class="paren">(<em>a</em>)</span></strong></em>'], '']);
41
- assert.deepStrictEqual(inspect(parser, input('***(**a**)***', new Context())), [['<em><strong><span class="paren">(<strong>a</strong>)</span></strong></em>'], '']);
42
- assert.deepStrictEqual(inspect(parser, input('***(***a***)***', new Context())), [['<em><strong><span class="paren">(<em><strong>a</strong></em>)</span></strong></em>'], '']);
43
- assert.deepStrictEqual(inspect(parser, input('***a*', new Context())), [['**', '<em>a</em>'], '']);
44
- assert.deepStrictEqual(inspect(parser, input('***a*b', new Context())), [['**', '<em>a</em>', 'b'], '']);
45
- assert.deepStrictEqual(inspect(parser, input('***a*b*', new Context())), [['**', '<em>a</em>', 'b'], '*']);
46
- assert.deepStrictEqual(inspect(parser, input('***a*b*c', new Context())), [['**', '<em>a</em>', 'b', '*', 'c'], '']);
47
- assert.deepStrictEqual(inspect(parser, input('***a*b*c*', new Context())), [['**', '<em>a</em>', 'b', '<em>c</em>'], '']);
48
- assert.deepStrictEqual(inspect(parser, input('***a*b*c**', new Context())), [['**', '<em>a</em>', 'b', '<em>c</em>'], '*']);
49
- assert.deepStrictEqual(inspect(parser, input('***a*b*c***', new Context())), [['<strong><em>a</em>b<em>c</em></strong>'], '']);
50
- assert.deepStrictEqual(inspect(parser, input('***a*b**', new Context())), [['<strong><em>a</em>b</strong>'], '']);
51
- assert.deepStrictEqual(inspect(parser, input('***a*b**c', new Context())), [['<strong><em>a</em>b</strong>'], 'c']);
52
- assert.deepStrictEqual(inspect(parser, input('***a**', new Context())), [['*', '<strong>a</strong>'], '']);
53
- assert.deepStrictEqual(inspect(parser, input('***a**b', new Context())), [['*', '<strong>a</strong>', 'b'], '']);
54
- assert.deepStrictEqual(inspect(parser, input('***a**b*', new Context())), [['<em><strong>a</strong>b</em>'], '']);
55
- assert.deepStrictEqual(inspect(parser, input('***a**b**', new Context())), [['<em><strong>a</strong>b</em>'], '*']);
56
- assert.deepStrictEqual(inspect(parser, input('***a**b**c', new Context())), [['*', '<strong>a</strong>', 'b', '**', 'c'], '']);
57
- assert.deepStrictEqual(inspect(parser, input('***a**b**c*', new Context())), [['<em><strong>a</strong>b**c</em>'], '']);
58
- assert.deepStrictEqual(inspect(parser, input('***a**b**c**', new Context())), [['*', '<strong>a</strong>', 'b', '<strong>c</strong>'], '']);
59
- assert.deepStrictEqual(inspect(parser, input('***a**b**c***', new Context())), [['<em><strong>a</strong>b<strong>c</strong></em>'], '']);
60
- assert.deepStrictEqual(inspect(parser, input('***a *b****', new Context())), [['<em><strong>a <em>b</em></strong></em>'], '']);
61
- assert.deepStrictEqual(inspect(parser, input('***a\\ *b****', new Context())), [['<em><strong>a <em>b</em></strong></em>'], '']);
62
- assert.deepStrictEqual(inspect(parser, input('***a&Tab;*b****', new Context())), [['<em><strong>a\t<em>b</em></strong></em>'], '']);
63
- assert.deepStrictEqual(inspect(parser, input('***a<wbr>*b****', new Context())), [['<em><strong>a<wbr><em>b</em></strong></em>'], '']);
64
- assert.deepStrictEqual(inspect(parser, input('***a *b****', new Context())), [['<em><strong>a <em>b</em></strong></em>'], '']);
65
- assert.deepStrictEqual(inspect(parser, input('***a* **b****', new Context())), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
66
- assert.deepStrictEqual(inspect(parser, input('***a*\\ **b****', new Context())), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
67
- assert.deepStrictEqual(inspect(parser, input('***a*&Tab;**b****', new Context())), [['<strong><em>a</em>\t<strong>b</strong></strong>'], '']);
68
- assert.deepStrictEqual(inspect(parser, input('***a*<wbr>**b****', new Context())), [['<strong><em>a</em><wbr><strong>b</strong></strong>'], '']);
69
- assert.deepStrictEqual(inspect(parser, input('***a*b **', new Context())), [['**', '<em>a</em>', 'b ', '**'], '']);
70
- assert.deepStrictEqual(inspect(parser, input('***a*b\\ **', new Context())), [['**', '<em>a</em>', 'b', ' ', '**'], '']);
71
- assert.deepStrictEqual(inspect(parser, input('***a**b*', new Context())), [['<em><strong>a</strong>b</em>'], '']);
72
- assert.deepStrictEqual(inspect(parser, input('***a**b*c', new Context())), [['<em><strong>a</strong>b</em>'], 'c']);
73
- assert.deepStrictEqual(inspect(parser, input('***a**b*c**', new Context())), [['<em><strong>a</strong>b</em>'], 'c**']);
74
- assert.deepStrictEqual(inspect(parser, input('***a**b**c***', new Context())), [['<em><strong>a</strong>b<strong>c</strong></em>'], '']);
75
- assert.deepStrictEqual(inspect(parser, input('***a**b**c***d', new Context())), [['<em><strong>a</strong>b<strong>c</strong></em>'], 'd']);
76
- assert.deepStrictEqual(inspect(parser, input('***a** *b**', new Context())), [['<em><strong>a</strong> <em>b</em></em>'], '']);
77
- assert.deepStrictEqual(inspect(parser, input('***a**\\ *b**', new Context())), [['<em><strong>a</strong> <em>b</em></em>'], '']);
78
- assert.deepStrictEqual(inspect(parser, input('***a**&Tab;*b**', new Context())), [['<em><strong>a</strong>\t<em>b</em></em>'], '']);
79
- assert.deepStrictEqual(inspect(parser, input('***a**<wbr>*b**', new Context())), [['<em><strong>a</strong><wbr><em>b</em></em>'], '']);
80
- assert.deepStrictEqual(inspect(parser, input('***a**b *', new Context())), [['*', '<strong>a</strong>', 'b ', '*'], '']);
81
- assert.deepStrictEqual(inspect(parser, input('***a**b\\ *', new Context())), [['*', '<strong>a</strong>', 'b', ' ', '*'], '']);
82
- assert.deepStrictEqual(inspect(parser, input('***a*', new Context())), [['**', '<em>a</em>'], '']);
83
- assert.deepStrictEqual(inspect(parser, input('***a**', new Context())), [['*', '<strong>a</strong>'], '']);
84
- assert.deepStrictEqual(inspect(parser, input('***a***', new Context())), [['<em><strong>a</strong></em>'], '']);
85
- assert.deepStrictEqual(inspect(parser, input('***a***b', new Context())), [['<em><strong>a</strong></em>'], 'b']);
86
- assert.deepStrictEqual(inspect(parser, input('***a****', new Context())), [['<em><strong>a</strong></em>'], '*']);
87
- assert.deepStrictEqual(inspect(parser, input('***a*****', new Context())), [['<em><strong>a</strong></em>'], '**']);
88
- assert.deepStrictEqual(inspect(parser, input('***a******', new Context())), [['<em><strong>a</strong></em>', '***'], '']);
89
- assert.deepStrictEqual(inspect(parser, input('****a***', new Context())), [['*', '<em><strong>a</strong></em>'], '']);
90
- assert.deepStrictEqual(inspect(parser, input('****a***b', new Context())), [['*', '<em><strong>a</strong></em>', 'b'], '']);
91
- assert.deepStrictEqual(inspect(parser, input('****a***b*', new Context())), [['<em><em><strong>a</strong></em>b</em>'], '']);
92
- assert.deepStrictEqual(inspect(parser, input('****a****', new Context())), [['<em><em><strong>a</strong></em></em>'], '']);
93
- assert.deepStrictEqual(inspect(parser, input('****a****b', new Context())), [['<em><em><strong>a</strong></em></em>'], 'b']);
94
- assert.deepStrictEqual(inspect(parser, input('*****a***', new Context())), [['**', '<em><strong>a</strong></em>'], '']);
95
- assert.deepStrictEqual(inspect(parser, input('*****a***b', new Context())), [['**', '<em><strong>a</strong></em>', 'b'], '']);
96
- assert.deepStrictEqual(inspect(parser, input('*****a***b**', new Context())), [['<strong><em><strong>a</strong></em>b</strong>'], '']);
97
- assert.deepStrictEqual(inspect(parser, input('*****a****', new Context())), [['*', '<em><em><strong>a</strong></em></em>'], '']);
98
- assert.deepStrictEqual(inspect(parser, input('*****a****b', new Context())), [['*', '<em><em><strong>a</strong></em></em>', 'b'], '']);
99
- assert.deepStrictEqual(inspect(parser, input('*****a****b*', new Context())), [['<em><em><em><strong>a</strong></em></em>b</em>'], '']);
100
- assert.deepStrictEqual(inspect(parser, input('*****a*****', new Context())), [['<strong><em><strong>a</strong></em></strong>'], '']);
101
- assert.deepStrictEqual(inspect(parser, input('******a***', new Context())), [['***', '<em><strong>a</strong></em>'], '']);
102
- assert.deepStrictEqual(inspect(parser, input('******a***b', new Context())), [['***', '<em><strong>a</strong></em>', 'b'], '']);
103
- assert.deepStrictEqual(inspect(parser, input('******a****', new Context())), [['**', '<em><em><strong>a</strong></em></em>'], '']);
104
- assert.deepStrictEqual(inspect(parser, input('******a****b', new Context())), [['**', '<em><em><strong>a</strong></em></em>', 'b'], '']);
105
- assert.deepStrictEqual(inspect(parser, input('******a****b**', new Context())), [['<strong><em><em><strong>a</strong></em></em>b</strong>'], '']);
106
- assert.deepStrictEqual(inspect(parser, input('******a*****', new Context())), [['*', '<strong><em><strong>a</strong></em></strong>'], '']);
107
- assert.deepStrictEqual(inspect(parser, input('******a*****b', new Context())), [['*', '<strong><em><strong>a</strong></em></strong>', 'b'], '']);
108
- assert.deepStrictEqual(inspect(parser, input('******a*****b*', new Context())), [['<em><strong><em><strong>a</strong></em></strong>b</em>'], '']);
109
- assert.deepStrictEqual(inspect(parser, input('******a******', new Context())), [['<em><strong><em><strong>a</strong></em></strong></em>'], '']);
110
- assert.deepStrictEqual(inspect(parser, input('******a******b', new Context())), [['<em><strong><em><strong>a</strong></em></strong></em>'], 'b']);
111
- assert.deepStrictEqual(inspect(parser, input('******a*b', new Context())), [['*****', '<em>a</em>', 'b'], '']);
112
- assert.deepStrictEqual(inspect(parser, input('******a*b *', new Context())), [['*****', '<em>a</em>', 'b ', '*'], '']);
113
- assert.deepStrictEqual(inspect(parser, input('******a*b **', new Context())), [['*****', '<em>a</em>', 'b ', '**'], '']);
114
- assert.deepStrictEqual(inspect(parser, input('******a*b ***', new Context())), [['*****', '<em>a</em>', 'b ', '***'], '']);
115
- assert.deepStrictEqual(inspect(parser, input('******a*b ****', new Context())), [['*****', '<em>a</em>', 'b ', '****'], '']);
116
- assert.deepStrictEqual(inspect(parser, input('******a*b *****', new Context())), [['*****', '<em>a</em>', 'b ', '*****'], '']);
117
- assert.deepStrictEqual(inspect(parser, input('******a*** b***', new Context())), [['<em><strong><em><strong>a</strong></em> b</strong></em>'], '']);
38
+ assert.deepStrictEqual(inspect(parser, input('***`a`***')), [['<em><strong><code data-src="`a`">a</code></strong></em>'], '']);
39
+ assert.deepStrictEqual(inspect(parser, input('***(*a*)***')), [['<em><strong><span class="paren">(<em>a</em>)</span></strong></em>'], '']);
40
+ assert.deepStrictEqual(inspect(parser, input('***(**a**)***')), [['<em><strong><span class="paren">(<strong>a</strong>)</span></strong></em>'], '']);
41
+ assert.deepStrictEqual(inspect(parser, input('***(***a***)***')), [['<em><strong><span class="paren">(<em><strong>a</strong></em>)</span></strong></em>'], '']);
42
+ assert.deepStrictEqual(inspect(parser, input('***a*')), [['**', '<em>a</em>'], '']);
43
+ assert.deepStrictEqual(inspect(parser, input('***a*b')), [['**', '<em>a</em>', 'b'], '']);
44
+ assert.deepStrictEqual(inspect(parser, input('***a*b*')), [['**', '<em>a</em>', 'b'], '*']);
45
+ assert.deepStrictEqual(inspect(parser, input('***a*b*c')), [['**', '<em>a</em>', 'b', '*', 'c'], '']);
46
+ assert.deepStrictEqual(inspect(parser, input('***a*b*c*')), [['**', '<em>a</em>', 'b', '<em>c</em>'], '']);
47
+ assert.deepStrictEqual(inspect(parser, input('***a*b*c**')), [['**', '<em>a</em>', 'b', '<em>c</em>'], '*']);
48
+ assert.deepStrictEqual(inspect(parser, input('***a*b*c***')), [['<strong><em>a</em>b<em>c</em></strong>'], '']);
49
+ assert.deepStrictEqual(inspect(parser, input('***a*b**')), [['<strong><em>a</em>b</strong>'], '']);
50
+ assert.deepStrictEqual(inspect(parser, input('***a*b**c')), [['<strong><em>a</em>b</strong>'], 'c']);
51
+ assert.deepStrictEqual(inspect(parser, input('***a**')), [['*', '<strong>a</strong>'], '']);
52
+ assert.deepStrictEqual(inspect(parser, input('***a**b')), [['*', '<strong>a</strong>', 'b'], '']);
53
+ assert.deepStrictEqual(inspect(parser, input('***a**b*')), [['<em><strong>a</strong>b</em>'], '']);
54
+ assert.deepStrictEqual(inspect(parser, input('***a**b**')), [['<em><strong>a</strong>b</em>'], '*']);
55
+ assert.deepStrictEqual(inspect(parser, input('***a**b**c')), [['*', '<strong>a</strong>', 'b', '**', 'c'], '']);
56
+ assert.deepStrictEqual(inspect(parser, input('***a**b**c*')), [['<em><strong>a</strong>b**c</em>'], '']);
57
+ assert.deepStrictEqual(inspect(parser, input('***a**b**c**')), [['*', '<strong>a</strong>', 'b', '<strong>c</strong>'], '']);
58
+ assert.deepStrictEqual(inspect(parser, input('***a**b**c***')), [['<em><strong>a</strong>b<strong>c</strong></em>'], '']);
59
+ assert.deepStrictEqual(inspect(parser, input('***a *b****')), [['<em><strong>a <em>b</em></strong></em>'], '']);
60
+ assert.deepStrictEqual(inspect(parser, input('***a\\ *b****')), [['<em><strong>a <em>b</em></strong></em>'], '']);
61
+ assert.deepStrictEqual(inspect(parser, input('***a&Tab;*b****')), [['<em><strong>a\t<em>b</em></strong></em>'], '']);
62
+ assert.deepStrictEqual(inspect(parser, input('***a<wbr>*b****')), [['<em><strong>a<wbr><em>b</em></strong></em>'], '']);
63
+ assert.deepStrictEqual(inspect(parser, input('***a *b****')), [['<em><strong>a <em>b</em></strong></em>'], '']);
64
+ assert.deepStrictEqual(inspect(parser, input('***a* **b****')), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
65
+ assert.deepStrictEqual(inspect(parser, input('***a*\\ **b****')), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
66
+ assert.deepStrictEqual(inspect(parser, input('***a*&Tab;**b****')), [['<strong><em>a</em>\t<strong>b</strong></strong>'], '']);
67
+ assert.deepStrictEqual(inspect(parser, input('***a*<wbr>**b****')), [['<strong><em>a</em><wbr><strong>b</strong></strong>'], '']);
68
+ assert.deepStrictEqual(inspect(parser, input('***a*b **')), [['**', '<em>a</em>', 'b ', '**'], '']);
69
+ assert.deepStrictEqual(inspect(parser, input('***a*b\\ **')), [['**', '<em>a</em>', 'b', ' ', '**'], '']);
70
+ assert.deepStrictEqual(inspect(parser, input('***a**b*')), [['<em><strong>a</strong>b</em>'], '']);
71
+ assert.deepStrictEqual(inspect(parser, input('***a**b*c')), [['<em><strong>a</strong>b</em>'], 'c']);
72
+ assert.deepStrictEqual(inspect(parser, input('***a**b*c**')), [['<em><strong>a</strong>b</em>'], 'c**']);
73
+ assert.deepStrictEqual(inspect(parser, input('***a**b**c***')), [['<em><strong>a</strong>b<strong>c</strong></em>'], '']);
74
+ assert.deepStrictEqual(inspect(parser, input('***a**b**c***d')), [['<em><strong>a</strong>b<strong>c</strong></em>'], 'd']);
75
+ assert.deepStrictEqual(inspect(parser, input('***a** *b**')), [['<em><strong>a</strong> <em>b</em></em>'], '']);
76
+ assert.deepStrictEqual(inspect(parser, input('***a**\\ *b**')), [['<em><strong>a</strong> <em>b</em></em>'], '']);
77
+ assert.deepStrictEqual(inspect(parser, input('***a**&Tab;*b**')), [['<em><strong>a</strong>\t<em>b</em></em>'], '']);
78
+ assert.deepStrictEqual(inspect(parser, input('***a**<wbr>*b**')), [['<em><strong>a</strong><wbr><em>b</em></em>'], '']);
79
+ assert.deepStrictEqual(inspect(parser, input('***a**b *')), [['*', '<strong>a</strong>', 'b ', '*'], '']);
80
+ assert.deepStrictEqual(inspect(parser, input('***a**b\\ *')), [['*', '<strong>a</strong>', 'b', ' ', '*'], '']);
81
+ assert.deepStrictEqual(inspect(parser, input('***a*')), [['**', '<em>a</em>'], '']);
82
+ assert.deepStrictEqual(inspect(parser, input('***a**')), [['*', '<strong>a</strong>'], '']);
83
+ assert.deepStrictEqual(inspect(parser, input('***a***')), [['<em><strong>a</strong></em>'], '']);
84
+ assert.deepStrictEqual(inspect(parser, input('***a***b')), [['<em><strong>a</strong></em>'], 'b']);
85
+ assert.deepStrictEqual(inspect(parser, input('***a****')), [['<em><strong>a</strong></em>'], '*']);
86
+ assert.deepStrictEqual(inspect(parser, input('***a*****')), [['<em><strong>a</strong></em>'], '**']);
87
+ assert.deepStrictEqual(inspect(parser, input('***a******')), [['<em><strong>a</strong></em>', '***'], '']);
88
+ assert.deepStrictEqual(inspect(parser, input('****a***')), [['*', '<em><strong>a</strong></em>'], '']);
89
+ assert.deepStrictEqual(inspect(parser, input('****a***b')), [['*', '<em><strong>a</strong></em>', 'b'], '']);
90
+ assert.deepStrictEqual(inspect(parser, input('****a***b*')), [['<em><em><strong>a</strong></em>b</em>'], '']);
91
+ assert.deepStrictEqual(inspect(parser, input('****a****')), [['<em><em><strong>a</strong></em></em>'], '']);
92
+ assert.deepStrictEqual(inspect(parser, input('****a****b')), [['<em><em><strong>a</strong></em></em>'], 'b']);
93
+ assert.deepStrictEqual(inspect(parser, input('*****a***')), [['**', '<em><strong>a</strong></em>'], '']);
94
+ assert.deepStrictEqual(inspect(parser, input('*****a***b')), [['**', '<em><strong>a</strong></em>', 'b'], '']);
95
+ assert.deepStrictEqual(inspect(parser, input('*****a***b**')), [['<strong><em><strong>a</strong></em>b</strong>'], '']);
96
+ assert.deepStrictEqual(inspect(parser, input('*****a****')), [['*', '<em><em><strong>a</strong></em></em>'], '']);
97
+ assert.deepStrictEqual(inspect(parser, input('*****a****b')), [['*', '<em><em><strong>a</strong></em></em>', 'b'], '']);
98
+ assert.deepStrictEqual(inspect(parser, input('*****a****b*')), [['<em><em><em><strong>a</strong></em></em>b</em>'], '']);
99
+ assert.deepStrictEqual(inspect(parser, input('*****a*****')), [['<strong><em><strong>a</strong></em></strong>'], '']);
100
+ assert.deepStrictEqual(inspect(parser, input('******a***')), [['***', '<em><strong>a</strong></em>'], '']);
101
+ assert.deepStrictEqual(inspect(parser, input('******a***b')), [['***', '<em><strong>a</strong></em>', 'b'], '']);
102
+ assert.deepStrictEqual(inspect(parser, input('******a****')), [['**', '<em><em><strong>a</strong></em></em>'], '']);
103
+ assert.deepStrictEqual(inspect(parser, input('******a****b')), [['**', '<em><em><strong>a</strong></em></em>', 'b'], '']);
104
+ assert.deepStrictEqual(inspect(parser, input('******a****b**')), [['<strong><em><em><strong>a</strong></em></em>b</strong>'], '']);
105
+ assert.deepStrictEqual(inspect(parser, input('******a*****')), [['*', '<strong><em><strong>a</strong></em></strong>'], '']);
106
+ assert.deepStrictEqual(inspect(parser, input('******a*****b')), [['*', '<strong><em><strong>a</strong></em></strong>', 'b'], '']);
107
+ assert.deepStrictEqual(inspect(parser, input('******a*****b*')), [['<em><strong><em><strong>a</strong></em></strong>b</em>'], '']);
108
+ assert.deepStrictEqual(inspect(parser, input('******a******')), [['<em><strong><em><strong>a</strong></em></strong></em>'], '']);
109
+ assert.deepStrictEqual(inspect(parser, input('******a******b')), [['<em><strong><em><strong>a</strong></em></strong></em>'], 'b']);
110
+ assert.deepStrictEqual(inspect(parser, input('******a*b')), [['*****', '<em>a</em>', 'b'], '']);
111
+ assert.deepStrictEqual(inspect(parser, input('******a*b *')), [['*****', '<em>a</em>', 'b ', '*'], '']);
112
+ assert.deepStrictEqual(inspect(parser, input('******a*b **')), [['*****', '<em>a</em>', 'b ', '**'], '']);
113
+ assert.deepStrictEqual(inspect(parser, input('******a*b ***')), [['*****', '<em>a</em>', 'b ', '***'], '']);
114
+ assert.deepStrictEqual(inspect(parser, input('******a*b ****')), [['*****', '<em>a</em>', 'b ', '****'], '']);
115
+ assert.deepStrictEqual(inspect(parser, input('******a*b *****')), [['*****', '<em>a</em>', 'b ', '*****'], '']);
116
+ assert.deepStrictEqual(inspect(parser, input('******a*** b***')), [['<em><strong><em><strong>a</strong></em> b</strong></em>'], '']);
118
117
  });
119
118
 
120
119
  });
@@ -1,7 +1,7 @@
1
1
  import { EmStrongParser, EmphasisParser, StrongParser } from '../inline';
2
2
  import { Recursion, Command } from '../context';
3
- import { Parser, Result, List, Node } from '../../combinator/data/parser';
4
- import { union, some, precedence, surround, lazy, bind } from '../../combinator';
3
+ import { Parser, Output, List, Node } from '../../combinator/parser';
4
+ import { union, some, precedence, backtrack, surround, lazy, bind } from '../../combinator';
5
5
  import { inline } from '../inline';
6
6
  import { strong } from './strong';
7
7
  import { emphasis } from './emphasis';
@@ -20,68 +20,114 @@ const subemphasis: Parser.IntermediateParser<EmphasisParser> = lazy(() => some(u
20
20
  strong,
21
21
  ])));
22
22
 
23
+ const c1 = lazy(() => union([
24
+ bind(subemphasis, (ds, input, output) => {
25
+ const { source } = input;
26
+ const bs = output.pop();
27
+ if (source.startsWith('*', input.position)) {
28
+ input.position += 1;
29
+ const buffer = new List<Node<HTMLElement | string>>().import(output.peek());
30
+ buffer.push(new Node(html('strong', defrag(unwrap(bs)))));
31
+ buffer.import(ds);
32
+ return new List([
33
+ new Node(html('em', defrag(unwrap(buffer)))),
34
+ new Node(Command.Separator),
35
+ ]);
36
+ }
37
+ else {
38
+ const buffer = new List<Node<HTMLElement | string>>().import(output.peek());
39
+ buffer.push(new Node(html('strong', defrag(unwrap(bs)))));
40
+ buffer.import(ds);
41
+ buffer.push(new Node(Command.Separator));
42
+ return prepend('*', buffer);
43
+ }
44
+ }),
45
+ (_, output: Output<string | HTMLElement>) =>
46
+ output.import(prepend('*', new List([new Node(html('strong', defrag(unwrap(output.pop())))), new Node(Command.Separator)]))),
47
+ ]));
48
+ const c2 = lazy(() => union([
49
+ bind(substrong, (ds, input, output) => {
50
+ const { source } = input;
51
+ const bs = output.pop();
52
+ if (source.startsWith('**', input.position)) {
53
+ input.position += 2;
54
+ const buffer = new List<Node<HTMLElement | string>>().import(output.peek());
55
+ buffer.push(new Node(html('em', defrag(unwrap(bs)))));
56
+ buffer.import(ds);
57
+ return new List([
58
+ new Node(html('strong', defrag(unwrap(buffer)))),
59
+ new Node(Command.Separator),
60
+ ]);
61
+ }
62
+ else {
63
+ const buffer = new List<Node<HTMLElement | string>>().import(output.peek());
64
+ buffer.push(new Node(html('em', defrag(unwrap(bs)))));
65
+ buffer.import(ds);
66
+ buffer.push(new Node(Command.Separator));
67
+ return prepend('**', buffer);
68
+ }
69
+ }),
70
+ (_, output: Output<string | HTMLElement>) =>
71
+ output.import(prepend('**', new List([new Node(html('em', defrag(unwrap(output.pop())))), new Node(Command.Separator)]))),
72
+ ]));
73
+ const t1 = lazy(() => union([
74
+ bind(subemphasis, (ds, input, output) => {
75
+ const { source } = input;
76
+ if (source.startsWith('*', input.position)) {
77
+ input.position += 1;
78
+ return new List([new Node(html('em', defrag(unwrap(output.pop().import(ds)))))]);
79
+ }
80
+ else {
81
+ return prepend('*', output.pop().import(ds));
82
+ }
83
+ }),
84
+ (_, output: Output<string | HTMLElement>) =>
85
+ output.import(prepend('*', output.pop())),
86
+ ]));
87
+ const t2 = lazy(() => union([
88
+ bind(substrong, (ds, input, output) => {
89
+ const { source } = input;
90
+ if (source.startsWith('**', input.position)) {
91
+ input.position += 2;
92
+ return new List([new Node(html('strong', defrag(unwrap(output.pop().import(ds)))))]);
93
+ }
94
+ else {
95
+ return prepend('**', output.pop().import(ds));
96
+ }
97
+ }),
98
+ (_, output: Output<string | HTMLElement>) =>
99
+ output.import(prepend('**', output.pop())),
100
+ ]));
101
+
23
102
  // 開閉が明示的でない構文は開閉の不明確な記号による再帰的適用を行わず
24
103
  // 可能な限り早く閉じるよう解析しなければならない。
25
104
  // このため終端記号の後ろを見て終端を中止し同じ構文を再帰的に適用してはならない。
26
105
  export const emstrong: EmStrongParser = lazy(() =>
27
- repeat('***', beforeNonblank, '***', Recursion.inline, precedence(0, surround(
106
+ repeat('***', beforeNonblank, '***', Recursion.inline, precedence(0, backtrack(surround(
28
107
  '',
29
108
  some(union([some(inline, '*', afterNonblank)])),
30
109
  strs('*', 1, 3),
31
110
  false, [],
32
- ([, bs, cs], context): Result<Parser.Node<EmStrongParser>, Parser.Context<EmStrongParser>> => {
111
+ ([, bs, cs], input, output) => {
33
112
  assert(cs.length === 1);
34
- const { buffer } = context;
35
113
  switch (cs.head!.value) {
36
114
  case '***':
37
- return buffer.import(bs);
115
+ return output.import(bs);
38
116
  case '**':
39
- return bind<EmphasisParser>(
40
- subemphasis,
41
- ds => {
42
- const { source } = context;
43
- if (source.startsWith('*', context.position)) {
44
- context.position += 1;
45
- buffer.push(new Node(html('strong', defrag(unwrap(bs)))));
46
- buffer.import(ds);
47
- return new List([new Node(html('em', defrag(unwrap(buffer)))), new Node(Command.Separator)]);
48
- }
49
- else {
50
- buffer.push(new Node(html('strong', defrag(unwrap(bs)))));
51
- buffer.import(ds);
52
- buffer.push(new Node(Command.Separator));
53
- return prepend('*', buffer);
54
- }
55
- })
56
- (context) ?? prepend('*', buffer.import(new List([new Node(html('strong', defrag(unwrap(bs)))), new Node(Command.Separator)])));
117
+ output.push(bs);
118
+ return c1(input, output);
57
119
  case '*':
58
- return bind<StrongParser>(
59
- substrong,
60
- ds => {
61
- const { source } = context;
62
- if (source.startsWith('**', context.position)) {
63
- context.position += 2;
64
- buffer.push(new Node(html('em', defrag(unwrap(bs)))));
65
- buffer.import(ds);
66
- return new List([new Node(html('strong', defrag(unwrap(buffer)))), new Node(Command.Separator)]);
67
- }
68
- else {
69
- buffer.push(new Node(html('em', defrag(unwrap(bs)))));
70
- buffer.import(ds);
71
- buffer.push(new Node(Command.Separator));
72
- return prepend('**', buffer);
73
- }
74
- })
75
- (context) ?? prepend('**', buffer.import(new List([new Node(html('em', defrag(unwrap(bs)))), new Node(Command.Separator)])));
120
+ output.push(bs);
121
+ return c2(input, output);
76
122
  }
77
123
  assert(false);
78
124
  },
79
- ([, bs], { buffer }) => bs && buffer.import(bs) && buffer.push(new Node(Command.Cancel)) && buffer)),
125
+ ([, bs], _, output) => bs && output.import(bs.push(new Node(Command.Cancel)))))),
80
126
  // 3以上の`*`に対してemの適用を保証する
81
127
  nodes => new List([new Node(html('em', [html('strong', defrag(unwrap(nodes)))]))]),
82
- (nodes, context, prefix, postfix, state) => {
83
- context.position += postfix;
84
- context.range += postfix;
128
+ (nodes, input, output, prefix, postfix, state) => {
129
+ input.position += postfix;
130
+ input.range += postfix;
85
131
  assert(postfix < 3);
86
132
  if (state) {
87
133
  switch (postfix) {
@@ -98,60 +144,32 @@ export const emstrong: EmStrongParser = lazy(() =>
98
144
  }
99
145
  prefix -= postfix;
100
146
  postfix -= postfix;
101
- context.range += postfix;
147
+ input.range += postfix;
102
148
  switch (prefix) {
103
149
  case 0:
104
- break;
150
+ return output.import(nodes);
105
151
  case 1:
106
- nodes = bind<EmphasisParser>(
107
- subemphasis,
108
- ds => {
109
- const { source } = context;
110
- if (source.startsWith('*', context.position)) {
111
- context.position += 1;
112
- return new List([new Node(html('em', defrag(unwrap(nodes.import(ds)))))]);
113
- }
114
- else {
115
- return prepend('*', nodes.import(ds));
116
- }
117
- })
118
- (context) ?? prepend('*', nodes);
119
- prefix -= 1;
120
- context.range += 1;
121
- break;
152
+ output.push(nodes);
153
+ return t1(input, output);
122
154
  case 2:
123
- nodes = bind<StrongParser>(
124
- substrong,
125
- ds => {
126
- const { source } = context;
127
- if (source.startsWith('**', context.position)) {
128
- context.position += 2;
129
- return new List([new Node(html('strong', defrag(unwrap(nodes.import(ds)))))]);
130
- }
131
- else {
132
- return prepend('**', nodes.import(ds));
133
- }
134
- })
135
- (context) ?? prepend('**', nodes);
136
- prefix -= 2;
137
- context.range += 2;
138
- break;
155
+ output.push(nodes);
156
+ return t2(input, output);
139
157
  }
140
158
  }
141
159
  if (prefix > postfix) {
142
160
  nodes = prepend('*'.repeat(prefix - postfix), nodes);
143
161
  prefix = 0;
144
- context.range += prefix - postfix;
162
+ input.range += prefix - postfix;
145
163
  }
146
- return nodes;
164
+ return output.import(nodes);
147
165
  }));
148
166
 
149
- function prepend<N>(prefix: string, nodes: List<Node<N>>): List<Node<N>> {
167
+ function prepend(prefix: string, nodes: List<Node<string | HTMLElement>>): List<Node<string | HTMLElement>> {
150
168
  if (typeof nodes.head?.value === 'string') {
151
- nodes.head.value = prefix + nodes.head.value as N;
169
+ nodes.head.value = prefix + nodes.head.value;
152
170
  }
153
171
  else {
154
- nodes.unshift(new Node(prefix as N));
172
+ nodes.unshift(new Node(prefix));
155
173
  }
156
174
  return nodes;
157
175
  }