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 { ruby } from './ruby';
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/ruby', () => {
@@ -9,57 +8,57 @@ describe('Unit: parser/inline/ruby', () => {
9
8
  const parser = some(ruby);
10
9
 
11
10
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
13
- assert.deepStrictEqual(inspect(parser, input('[(b)', new Context())), undefined);
14
- assert.deepStrictEqual(inspect(parser, input('[]()', new Context())), undefined);
15
- assert.deepStrictEqual(inspect(parser, input('[](b)', new Context())), undefined);
16
- assert.deepStrictEqual(inspect(parser, input('[ ](b)', new Context())), undefined);
17
- assert.deepStrictEqual(inspect(parser, input('[ a](b)', new Context())), undefined);
18
- assert.deepStrictEqual(inspect(parser, input('[	a](b)', new Context())), undefined);
19
- assert.deepStrictEqual(inspect(parser, input('[	 a](b)', new Context())), undefined);
20
- assert.deepStrictEqual(inspect(parser, input('[&a;](b)', new Context())), [['<ruby>&amp;a;<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
21
- assert.deepStrictEqual(inspect(parser, input('[a](&a;)', new Context())), [['<ruby>a<rp>(</rp><rt>&amp;a;</rt><rp>)</rp></ruby>'], '']);
22
- assert.deepStrictEqual(inspect(parser, input('[<wbr>](a)', new Context())), undefined);
23
- assert.deepStrictEqual(inspect(parser, input('[a](<wbr>)', new Context())), undefined);
24
- assert.deepStrictEqual(inspect(parser, input('[a]()', new Context())), undefined);
25
- assert.deepStrictEqual(inspect(parser, input('[a]( )', new Context())), undefined);
26
- assert.deepStrictEqual(inspect(parser, input('[a\nb](c)', new Context())), undefined);
27
- assert.deepStrictEqual(inspect(parser, input('[a](b\nc)', new Context())), undefined);
28
- assert.deepStrictEqual(inspect(parser, input(' [a](b)', new Context())), undefined);
11
+ assert.deepStrictEqual(inspect(parser, input('')), undefined);
12
+ assert.deepStrictEqual(inspect(parser, input('[(b)')), undefined);
13
+ assert.deepStrictEqual(inspect(parser, input('[]()')), undefined);
14
+ assert.deepStrictEqual(inspect(parser, input('[](b)')), undefined);
15
+ assert.deepStrictEqual(inspect(parser, input('[ ](b)')), undefined);
16
+ assert.deepStrictEqual(inspect(parser, input('[ a](b)')), undefined);
17
+ assert.deepStrictEqual(inspect(parser, input('[&Tab;a](b)')), undefined);
18
+ assert.deepStrictEqual(inspect(parser, input('[&Tab; a](b)')), undefined);
19
+ assert.deepStrictEqual(inspect(parser, input('[&a;](b)')), [['<ruby>&amp;a;<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
20
+ assert.deepStrictEqual(inspect(parser, input('[a](&a;)')), [['<ruby>a<rp>(</rp><rt>&amp;a;</rt><rp>)</rp></ruby>'], '']);
21
+ assert.deepStrictEqual(inspect(parser, input('[<wbr>](a)')), undefined);
22
+ assert.deepStrictEqual(inspect(parser, input('[a](<wbr>)')), undefined);
23
+ assert.deepStrictEqual(inspect(parser, input('[a]()')), undefined);
24
+ assert.deepStrictEqual(inspect(parser, input('[a]( )')), undefined);
25
+ assert.deepStrictEqual(inspect(parser, input('[a\nb](c)')), undefined);
26
+ assert.deepStrictEqual(inspect(parser, input('[a](b\nc)')), undefined);
27
+ assert.deepStrictEqual(inspect(parser, input(' [a](b)')), undefined);
29
28
  });
30
29
 
31
30
  it('basic', () => {
32
- assert.deepStrictEqual(inspect(parser, input('[A](a)', new Context())), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
33
- assert.deepStrictEqual(inspect(parser, input('[A](ab)', new Context())), [['<ruby>A<rp>(</rp><rt>ab</rt><rp>)</rp></ruby>'], '']);
34
- assert.deepStrictEqual(inspect(parser, input('[A](a b)', new Context())), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
35
- assert.deepStrictEqual(inspect(parser, input('[A ](a)', new Context())), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
36
- assert.deepStrictEqual(inspect(parser, input('[A ](a b)', new Context())), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
37
- assert.deepStrictEqual(inspect(parser, input('[A ](a b )', new Context())), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
38
- assert.deepStrictEqual(inspect(parser, input('[A ](a)', new Context())), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp><rt></rt></ruby>'], '']);
39
- assert.deepStrictEqual(inspect(parser, input('[A \\ ](a)', new Context())), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp> <rt></rt></ruby>'], '']);
40
- assert.deepStrictEqual(inspect(parser, input('[AB](a)', new Context())), [['<ruby>AB<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
41
- assert.deepStrictEqual(inspect(parser, input('[AB](a )', new Context())), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt></ruby>'], '']);
42
- assert.deepStrictEqual(inspect(parser, input('[AB]( b)', new Context())), [['<ruby>A<rt></rt>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
43
- assert.deepStrictEqual(inspect(parser, input('[AB](ab)', new Context())), [['<ruby>AB<rp>(</rp><rt>ab</rt><rp>)</rp></ruby>'], '']);
44
- assert.deepStrictEqual(inspect(parser, input('[AB](a b)', new Context())), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
45
- assert.deepStrictEqual(inspect(parser, input('[AB](a b )', new Context())), [['<ruby>AB<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
46
- assert.deepStrictEqual(inspect(parser, input('[AB](a b c)', new Context())), [['<ruby>AB<rp>(</rp><rt>a b c</rt><rp>)</rp></ruby>'], '']);
47
- assert.deepStrictEqual(inspect(parser, input('[A B](ab)', new Context())), [['<ruby>A<rp>(</rp><rt>ab</rt><rp>)</rp>B<rt></rt></ruby>'], '']);
48
- assert.deepStrictEqual(inspect(parser, input('[A B](a b)', new Context())), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
49
- assert.deepStrictEqual(inspect(parser, input('[A B](a b )', new Context())), [['<ruby>A B<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
50
- assert.deepStrictEqual(inspect(parser, input('[ABC](a )', new Context())), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt>C<rt></rt></ruby>'], '']);
51
- assert.deepStrictEqual(inspect(parser, input('[ABC](a )', new Context())), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt>C<rt></rt></ruby>'], '']);
52
- assert.deepStrictEqual(inspect(parser, input('[ABC]( b)', new Context())), [['<ruby>A<rt></rt>B<rp>(</rp><rt>b</rt><rp>)</rp>C<rt></rt></ruby>'], '']);
53
- assert.deepStrictEqual(inspect(parser, input('[ABC]( b )', new Context())), [['<ruby>A<rt></rt>B<rp>(</rp><rt>b</rt><rp>)</rp>C<rt></rt></ruby>'], '']);
54
- assert.deepStrictEqual(inspect(parser, input('[ABC]( c)', new Context())), [['<ruby>A<rt></rt>B<rt></rt>C<rp>(</rp><rt>c</rt><rp>)</rp></ruby>'], '']);
55
- assert.deepStrictEqual(inspect(parser, input('[ABC](a c)', new Context())), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt>C<rp>(</rp><rt>c</rt><rp>)</rp></ruby>'], '']);
56
- assert.deepStrictEqual(inspect(parser, input('[東方](とう ほう)', new Context())), [['<ruby>東<rp>(</rp><rt>とう</rt><rp>)</rp>方<rp>(</rp><rt>ほう</rt><rp>)</rp></ruby>'], '']);
57
- assert.deepStrictEqual(inspect(parser, input('[秦 \\  こころ](はた の こころ)', new Context())), [['<ruby>秦<rp>(</rp><rt>はた</rt><rp>)</rp> <rp>(</rp><rt>の</rt><rp>)</rp>こころ<rp>(</rp><rt>こころ</rt><rp>)</rp></ruby>'], '']);
58
- assert.deepStrictEqual(inspect(parser, input('[秦 &nbsp; こころ](はた の こころ)', new Context())), [['<ruby>秦<rp>(</rp><rt>はた</rt><rp>)</rp>&nbsp;<rp>(</rp><rt>の</rt><rp>)</rp>こころ<rp>(</rp><rt>こころ</rt><rp>)</rp></ruby>'], '']);
59
- assert.deepStrictEqual(inspect(parser, input('[&&](&&)', new Context())), [['<ruby>&amp;&amp;<rp>(</rp><rt>&amp;&amp;</rt><rp>)</rp></ruby>'], '']);
60
- assert.deepStrictEqual(inspect(parser, input('[&copy;](&copy;)', new Context())), [['<ruby>©<rp>(</rp><rt>©</rt><rp>)</rp></ruby>'], '']);
61
- assert.deepStrictEqual(inspect(parser, input('[&amp;copy;](&amp;copy;)', new Context())), [['<ruby>&amp;copy;<rp>(</rp><rt>&amp;copy;</rt><rp>)</rp></ruby>'], '']);
62
- assert.deepStrictEqual(inspect(parser, input('[*A*](*a*)', new Context())), [['<ruby>*A*<rp>(</rp><rt>*a*</rt><rp>)</rp></ruby>'], '']);
31
+ assert.deepStrictEqual(inspect(parser, input('[A](a)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
32
+ assert.deepStrictEqual(inspect(parser, input('[A](ab)')), [['<ruby>A<rp>(</rp><rt>ab</rt><rp>)</rp></ruby>'], '']);
33
+ assert.deepStrictEqual(inspect(parser, input('[A](a b)')), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
34
+ assert.deepStrictEqual(inspect(parser, input('[A ](a)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
35
+ assert.deepStrictEqual(inspect(parser, input('[A ](a b)')), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
36
+ assert.deepStrictEqual(inspect(parser, input('[A ](a b )')), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
37
+ assert.deepStrictEqual(inspect(parser, input('[A ](a)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp><rt></rt></ruby>'], '']);
38
+ assert.deepStrictEqual(inspect(parser, input('[A \\ ](a)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp> <rt></rt></ruby>'], '']);
39
+ assert.deepStrictEqual(inspect(parser, input('[AB](a)')), [['<ruby>AB<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
40
+ assert.deepStrictEqual(inspect(parser, input('[AB](a )')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt></ruby>'], '']);
41
+ assert.deepStrictEqual(inspect(parser, input('[AB]( b)')), [['<ruby>A<rt></rt>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
42
+ assert.deepStrictEqual(inspect(parser, input('[AB](ab)')), [['<ruby>AB<rp>(</rp><rt>ab</rt><rp>)</rp></ruby>'], '']);
43
+ assert.deepStrictEqual(inspect(parser, input('[AB](a b)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
44
+ assert.deepStrictEqual(inspect(parser, input('[AB](a b )')), [['<ruby>AB<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
45
+ assert.deepStrictEqual(inspect(parser, input('[AB](a b c)')), [['<ruby>AB<rp>(</rp><rt>a b c</rt><rp>)</rp></ruby>'], '']);
46
+ assert.deepStrictEqual(inspect(parser, input('[A B](ab)')), [['<ruby>A<rp>(</rp><rt>ab</rt><rp>)</rp>B<rt></rt></ruby>'], '']);
47
+ assert.deepStrictEqual(inspect(parser, input('[A B](a b)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
48
+ assert.deepStrictEqual(inspect(parser, input('[A B](a b )')), [['<ruby>A B<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
49
+ assert.deepStrictEqual(inspect(parser, input('[ABC](a )')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt>C<rt></rt></ruby>'], '']);
50
+ assert.deepStrictEqual(inspect(parser, input('[ABC](a )')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt>C<rt></rt></ruby>'], '']);
51
+ assert.deepStrictEqual(inspect(parser, input('[ABC]( b)')), [['<ruby>A<rt></rt>B<rp>(</rp><rt>b</rt><rp>)</rp>C<rt></rt></ruby>'], '']);
52
+ assert.deepStrictEqual(inspect(parser, input('[ABC]( b )')), [['<ruby>A<rt></rt>B<rp>(</rp><rt>b</rt><rp>)</rp>C<rt></rt></ruby>'], '']);
53
+ assert.deepStrictEqual(inspect(parser, input('[ABC]( c)')), [['<ruby>A<rt></rt>B<rt></rt>C<rp>(</rp><rt>c</rt><rp>)</rp></ruby>'], '']);
54
+ assert.deepStrictEqual(inspect(parser, input('[ABC](a c)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt>C<rp>(</rp><rt>c</rt><rp>)</rp></ruby>'], '']);
55
+ assert.deepStrictEqual(inspect(parser, input('[東方](とう ほう)')), [['<ruby>東<rp>(</rp><rt>とう</rt><rp>)</rp>方<rp>(</rp><rt>ほう</rt><rp>)</rp></ruby>'], '']);
56
+ assert.deepStrictEqual(inspect(parser, input('[秦 \\  こころ](はた の こころ)')), [['<ruby>秦<rp>(</rp><rt>はた</rt><rp>)</rp> <rp>(</rp><rt>の</rt><rp>)</rp>こころ<rp>(</rp><rt>こころ</rt><rp>)</rp></ruby>'], '']);
57
+ assert.deepStrictEqual(inspect(parser, input('[秦 &nbsp; こころ](はた の こころ)')), [['<ruby>秦<rp>(</rp><rt>はた</rt><rp>)</rp>&nbsp;<rp>(</rp><rt>の</rt><rp>)</rp>こころ<rp>(</rp><rt>こころ</rt><rp>)</rp></ruby>'], '']);
58
+ assert.deepStrictEqual(inspect(parser, input('[&&](&&)')), [['<ruby>&amp;&amp;<rp>(</rp><rt>&amp;&amp;</rt><rp>)</rp></ruby>'], '']);
59
+ assert.deepStrictEqual(inspect(parser, input('[&copy;](&copy;)')), [['<ruby>©<rp>(</rp><rt>©</rt><rp>)</rp></ruby>'], '']);
60
+ assert.deepStrictEqual(inspect(parser, input('[&amp;copy;](&amp;copy;)')), [['<ruby>&amp;copy;<rp>(</rp><rt>&amp;copy;</rt><rp>)</rp></ruby>'], '']);
61
+ assert.deepStrictEqual(inspect(parser, input('[*A*](*a*)')), [['<ruby>*A*<rp>(</rp><rt>*a*</rt><rp>)</rp></ruby>'], '']);
63
62
  });
64
63
 
65
64
  });
@@ -1,31 +1,33 @@
1
1
  import { RubyParser } from '../inline';
2
- import { Backtrack } from '../context';
3
- import { List, Node } from '../../combinator/data/parser';
4
- import { inits, surround, setBacktrack, dup, lazy, bind } from '../../combinator';
2
+ import { Input, Backtrack } from '../context';
3
+ import { Parser, Result, List, Node } from '../../combinator/parser';
4
+ import { union, inits, always, backtrack, surround, setBacktrack, dup, lazy, bind } from '../../combinator';
5
5
  import { unsafehtmlentity } from './htmlentity';
6
6
  import { txt } from '../source';
7
7
  import { isNonblankNodeStart } from '../visibility';
8
8
  import { unwrap } from '../util';
9
9
  import { html, defrag } from 'typed-dom/dom';
10
10
 
11
- export const ruby: RubyParser = lazy(() => bind(
11
+ export const ruby: RubyParser = lazy(() => backtrack(bind(
12
12
  inits([
13
13
  dup(surround(
14
14
  '[', text, ']',
15
15
  false,
16
16
  [1 | Backtrack.common, 3 | Backtrack.ruby],
17
- ([, ns]) => {
17
+ ([, ns], _, output) => {
18
18
  ns && ns.last?.value === '' && ns.pop();
19
- return isNonblankNodeStart(ns) ? ns : undefined;
19
+ return isNonblankNodeStart(ns)
20
+ ? output.import(ns)
21
+ : Result.fail;
20
22
  })),
21
23
  dup(surround(
22
24
  '(', text, ')',
23
25
  false)),
24
26
  ]),
25
- ([{ value: texts }, { value: rubies = undefined } = {}], context) => {
27
+ ([{ value: texts }, { value: rubies = undefined } = {}], input) => {
26
28
  if (rubies === undefined) {
27
- const head = context.position - context.range;
28
- return void setBacktrack(context, 2 | Backtrack.link | Backtrack.ruby, head);
29
+ const head = input.position - input.range;
30
+ return void setBacktrack(input, 2 | Backtrack.link | Backtrack.ruby, head);
29
31
  }
30
32
  switch (true) {
31
33
  case texts.length >= rubies.length:
@@ -59,51 +61,60 @@ export const ruby: RubyParser = lazy(() => bind(
59
61
  ]))))),
60
62
  ]);
61
63
  }
62
- }));
64
+ })));
63
65
 
64
66
  const delimiter = /[$"`\[\](){}<>()[]{}|]|\\?\r?\n/y;
65
67
 
66
- const text: RubyParser.TextParser = input => {
67
- const context = input;
68
- const { source } = context;
69
- const acc = new List([new Node('')]);
70
- let state = false;
71
- context.sequential = true;
72
- for (let { position } = context; position < source.length; position = context.position) {
73
- delimiter.lastIndex = position;
74
- if (delimiter.test(source)) break;
75
- assert(source[position] !== '\n');
76
- switch (source[position]) {
77
- case '&': {
78
- const result = source[position + 1] !== ' '
79
- ? unsafehtmlentity(input) ?? txt(input)!
80
- : txt(input)!;
81
- assert(result);
82
- acc.last!.value += result.head!.value;
83
- continue;
84
- }
85
- default: {
86
- if (source[position].trimStart() === '') {
87
- state ||= acc.last!.value.trimStart() !== '';
88
- acc.push(new Node(''));
89
- context.position += 1;
90
- continue;
91
- }
92
- const result = txt(input)!;
93
- assert(result);
94
- acc.last!.value += result.head?.value ?? '';
95
- continue;
96
- }
68
+ interface Memory {
69
+ position: number;
70
+ state: boolean;
71
+ nodes: List<Node<string>>;
72
+ }
73
+ const text: RubyParser.TextParser = always<Parser<string, Input<Memory>>>([
74
+ (input, output) => {
75
+ input.sequential = true;
76
+ input.memory = {
77
+ position: 0,
78
+ state: false,
79
+ nodes: new List([new Node('')]),
80
+ };
81
+ return output.context;
82
+ },
83
+ () => loop,
84
+ (input, output) => {
85
+ const { memory } = input;
86
+ input.sequential = false;
87
+ return memory.state || memory.nodes.last!.value.trimStart() !== ''
88
+ ? output.import(memory.nodes)
89
+ : undefined;
90
+ },
91
+ ]);
92
+ const loop: Result<string, Input<Memory>> = [
93
+ (input, output) => {
94
+ const { source, memory } = input;
95
+ for (let { position } = input; ; position = input.position) {
96
+ if (position === source.length) return Result.skip;
97
+ delimiter.lastIndex = position;
98
+ if (delimiter.test(source)) return Result.skip;
99
+ assert(source[position] !== '\n');
100
+ if (source[position].trimStart() !== '') break;
101
+ memory.state ||= memory.nodes.last!.value.trimStart() !== '';
102
+ memory.nodes.push(new Node(''));
103
+ input.position += 1;
97
104
  }
98
- }
99
- context.sequential = false;
100
- state ||= acc.last!.value.trimStart() !== '';
101
- return state
102
- ? acc
103
- : undefined;
104
- };
105
+ memory.position = input.position;
106
+ return output.context;
107
+ },
108
+ union([unsafehtmlentity, txt]),
109
+ (input, output) => {
110
+ assert(output.state);
111
+ input.memory.nodes.last!.value += output.peek().pop()?.value ?? '';
112
+ assert(output.peek().length === 0);
113
+ return loop;
114
+ },
115
+ ];
105
116
 
106
- function* zip<N extends List.Node>(a: List<N>, b: List<N>): Iterable<[N | undefined, N | undefined]> {
117
+ function* zip<N extends Node<unknown>>(a: List<N>, b: List<N>): Iterable<[N | undefined, N | undefined]> {
107
118
  const ia = a[Symbol.iterator]();
108
119
  const ib = b[Symbol.iterator]();
109
120
  for (; ;) {
@@ -1,7 +1,6 @@
1
1
  import { shortmedia } from './shortmedia';
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/shortmedia', () => {
@@ -9,17 +8,17 @@ describe('Unit: parser/inline/shortmedia', () => {
9
8
  const parser = some(shortmedia);
10
9
 
11
10
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
13
- assert.deepStrictEqual(inspect(parser, input('!http', new Context())), undefined);
14
- assert.deepStrictEqual(inspect(parser, input('!ttp', new Context())), undefined);
15
- assert.deepStrictEqual(inspect(parser, input('!http://', new Context())), undefined);
16
- assert.deepStrictEqual(inspect(parser, input('!Http://host', new Context())), undefined);
17
- assert.deepStrictEqual(inspect(parser, input(' !http://host', new Context())), undefined);
11
+ assert.deepStrictEqual(inspect(parser, input('')), undefined);
12
+ assert.deepStrictEqual(inspect(parser, input('!http')), undefined);
13
+ assert.deepStrictEqual(inspect(parser, input('!ttp')), undefined);
14
+ assert.deepStrictEqual(inspect(parser, input('!http://')), undefined);
15
+ assert.deepStrictEqual(inspect(parser, input('!Http://host')), undefined);
16
+ assert.deepStrictEqual(inspect(parser, input(' !http://host')), undefined);
18
17
  });
19
18
 
20
19
  it('basic', () => {
21
- assert.deepStrictEqual(inspect(parser, input('!http://host', new Context())), [['<a href="http://host" target="_blank"><img class="media" data-src="http://host" alt="http://host"></a>'], '']);
22
- assert.deepStrictEqual(inspect(parser, input('!https://host', new Context())), [['<a href="https://host" target="_blank"><img class="media" data-src="https://host" alt="https://host"></a>'], '']);
20
+ assert.deepStrictEqual(inspect(parser, input('!http://host')), [['<a href="http://host" target="_blank"><img class="media" data-src="http://host" alt="http://host"></a>'], '']);
21
+ assert.deepStrictEqual(inspect(parser, input('!https://host')), [['<a href="https://host" target="_blank"><img class="media" data-src="https://host" alt="https://host"></a>'], '']);
23
22
  });
24
23
 
25
24
  });
@@ -1,17 +1,19 @@
1
1
  import { ShortMediaParser } from '../inline';
2
2
  import { State } from '../context';
3
- import { union, constraint, focus, rewrite, open, convert } from '../../combinator';
3
+ import { union, constraint, scope, focus, rewrite, open, lazy } from '../../combinator';
4
4
  import { url } from './autolink/url';
5
5
  import { media } from './media';
6
6
 
7
- export const shortmedia: ShortMediaParser = constraint(State.media, rewrite(
7
+ export const shortmedia: ShortMediaParser = lazy(() => constraint(State.media, rewrite(
8
8
  open('!', url),
9
- convert(
10
- source => `!{ ${source.slice(1)} }`,
11
- union([media]))));
9
+ scope(
10
+ ({ source }) => `!{ ${source.slice(1)} }`,
11
+ union([media]),
12
+ true))));
12
13
 
13
- export const lineshortmedia: ShortMediaParser.LineShortMediaParser = constraint(State.media, focus(
14
+ export const lineshortmedia: ShortMediaParser.LineShortMediaParser = lazy(() => constraint(State.media, focus(
14
15
  /(?<=^|[\r\n])!https?:\/\/\S+(?=[^\S\r\n]*(?:$|\r?\n))/y,
15
- convert(
16
- source => `!{ ${source.slice(1)} }`,
17
- union([media]))));
16
+ scope(
17
+ ({ source }) => `!{ ${source.slice(1)} }`,
18
+ union([media]),
19
+ true))));
@@ -1,7 +1,6 @@
1
1
  import { strong } from './strong';
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/strong', () => {
@@ -9,47 +8,47 @@ describe('Unit: parser/inline/strong', () => {
9
8
  const parser = some(strong);
10
9
 
11
10
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser, input('**', new Context())), undefined);
13
- assert.deepStrictEqual(inspect(parser, input('**a', new Context())), [['**', 'a'], '']);
14
- assert.deepStrictEqual(inspect(parser, input('**a **', new Context())), [['**', 'a ', '**'], '']);
15
- assert.deepStrictEqual(inspect(parser, input('**a **', new Context())), [['**', 'a', ' ', '**'], '']);
16
- assert.deepStrictEqual(inspect(parser, input('**a\n**', new Context())), [['**', 'a', '<br>', '**'], '']);
17
- assert.deepStrictEqual(inspect(parser, input('**a\\ **', new Context())), [['**', 'a', ' ', '**'], '']);
18
- assert.deepStrictEqual(inspect(parser, input('**a\\\n**', new Context())), [['**', 'a', '<br>', '**'], '']);
19
- assert.deepStrictEqual(inspect(parser, input('**a*', new Context())), [['**', 'a'], '*']);
20
- assert.deepStrictEqual(inspect(parser, input('**a*b**', new Context())), [['**', 'a', '<em>b</em>'], '*']);
21
- assert.deepStrictEqual(inspect(parser, input('** **', new Context())), undefined);
22
- assert.deepStrictEqual(inspect(parser, input('** a**', new Context())), undefined);
23
- assert.deepStrictEqual(inspect(parser, input('** a **', new Context())), undefined);
24
- assert.deepStrictEqual(inspect(parser, input('**\n**', new Context())), undefined);
25
- assert.deepStrictEqual(inspect(parser, input('**\na**', new Context())), undefined);
26
- assert.deepStrictEqual(inspect(parser, input('**\\ a**', new Context())), undefined);
27
- assert.deepStrictEqual(inspect(parser, input('**\\\na**', new Context())), undefined);
28
- assert.deepStrictEqual(inspect(parser, input('**<wbr>a**', new Context())), undefined);
29
- assert.deepStrictEqual(inspect(parser, input('***a***', new Context())), undefined);
30
- assert.deepStrictEqual(inspect(parser, input(' **a**', new Context())), undefined);
11
+ assert.deepStrictEqual(inspect(parser, input('**')), undefined);
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('**a*')), [['**', 'a'], '*']);
19
+ assert.deepStrictEqual(inspect(parser, input('**a*b**')), [['**', 'a', '<em>b</em>'], '*']);
20
+ assert.deepStrictEqual(inspect(parser, input('** **')), undefined);
21
+ assert.deepStrictEqual(inspect(parser, input('** a**')), undefined);
22
+ assert.deepStrictEqual(inspect(parser, input('** a **')), undefined);
23
+ assert.deepStrictEqual(inspect(parser, input('**\n**')), undefined);
24
+ assert.deepStrictEqual(inspect(parser, input('**\na**')), undefined);
25
+ assert.deepStrictEqual(inspect(parser, input('**\\ a**')), undefined);
26
+ assert.deepStrictEqual(inspect(parser, input('**\\\na**')), undefined);
27
+ assert.deepStrictEqual(inspect(parser, input('**<wbr>a**')), undefined);
28
+ assert.deepStrictEqual(inspect(parser, input('***a***')), undefined);
29
+ assert.deepStrictEqual(inspect(parser, input(' **a**')), undefined);
31
30
  });
32
31
 
33
32
  it('basic', () => {
34
- assert.deepStrictEqual(inspect(parser, input('**a**', new Context())), [['<strong>a</strong>'], '']);
35
- assert.deepStrictEqual(inspect(parser, input('**ab**', new Context())), [['<strong>ab</strong>'], '']);
36
- assert.deepStrictEqual(inspect(parser, input('**a\nb**', new Context())), [['<strong>a<br>b</strong>'], '']);
37
- assert.deepStrictEqual(inspect(parser, input('**a\\\nb**', new Context())), [['<strong>a<br>b</strong>'], '']);
33
+ assert.deepStrictEqual(inspect(parser, input('**a**')), [['<strong>a</strong>'], '']);
34
+ assert.deepStrictEqual(inspect(parser, input('**ab**')), [['<strong>ab</strong>'], '']);
35
+ assert.deepStrictEqual(inspect(parser, input('**a\nb**')), [['<strong>a<br>b</strong>'], '']);
36
+ assert.deepStrictEqual(inspect(parser, input('**a\\\nb**')), [['<strong>a<br>b</strong>'], '']);
38
37
  });
39
38
 
40
39
  it('nest', () => {
41
- assert.deepStrictEqual(inspect(parser, input('**a *b***', new Context())), [['<strong>a <em>b</em></strong>'], '']);
42
- assert.deepStrictEqual(inspect(parser, input('**- *b***', new Context())), [['<strong>- <em>b</em></strong>'], '']);
43
- assert.deepStrictEqual(inspect(parser, input('**a **b****', new Context())), [['<strong>a <strong>b</strong></strong>'], '']);
44
- assert.deepStrictEqual(inspect(parser, input('**a&Tab;**b****', new Context())), [['<strong>a\t<strong>b</strong></strong>'], '']);
45
- assert.deepStrictEqual(inspect(parser, input('**a<wbr>**b****', new Context())), [['<strong>a<wbr><strong>b</strong></strong>'], '']);
46
- assert.deepStrictEqual(inspect(parser, input('**a*b*', new Context())), [['**', 'a', '<em>b</em>'], '']);
47
- assert.deepStrictEqual(inspect(parser, input('**a*b*c', new Context())), [['**', 'a', '<em>b</em>', 'c'], '']);
48
- assert.deepStrictEqual(inspect(parser, input('**a*b*c**', new Context())), [['<strong>a<em>b</em>c</strong>'], '']);
49
- assert.deepStrictEqual(inspect(parser, input('**a*b*c**d', new Context())), [['<strong>a<em>b</em>c</strong>'], 'd']);
50
- assert.deepStrictEqual(inspect(parser, input('**`a`**', new Context())), [['<strong><code data-src="`a`">a</code></strong>'], '']);
51
- assert.deepStrictEqual(inspect(parser, input('**(*a*)**', new Context())), [['<strong><span class="paren">(<em>a</em>)</span></strong>'], '']);
52
- assert.deepStrictEqual(inspect(parser, input('**(**a**)**', new Context())), [['<strong><span class="paren">(<strong>a</strong>)</span></strong>'], '']);
40
+ assert.deepStrictEqual(inspect(parser, input('**a *b***')), [['<strong>a <em>b</em></strong>'], '']);
41
+ assert.deepStrictEqual(inspect(parser, input('**- *b***')), [['<strong>- <em>b</em></strong>'], '']);
42
+ assert.deepStrictEqual(inspect(parser, input('**a **b****')), [['<strong>a <strong>b</strong></strong>'], '']);
43
+ assert.deepStrictEqual(inspect(parser, input('**a&Tab;**b****')), [['<strong>a\t<strong>b</strong></strong>'], '']);
44
+ assert.deepStrictEqual(inspect(parser, input('**a<wbr>**b****')), [['<strong>a<wbr><strong>b</strong></strong>'], '']);
45
+ assert.deepStrictEqual(inspect(parser, input('**a*b*')), [['**', 'a', '<em>b</em>'], '']);
46
+ assert.deepStrictEqual(inspect(parser, input('**a*b*c')), [['**', 'a', '<em>b</em>', 'c'], '']);
47
+ assert.deepStrictEqual(inspect(parser, input('**a*b*c**')), [['<strong>a<em>b</em>c</strong>'], '']);
48
+ assert.deepStrictEqual(inspect(parser, input('**a*b*c**d')), [['<strong>a<em>b</em>c</strong>'], 'd']);
49
+ assert.deepStrictEqual(inspect(parser, input('**`a`**')), [['<strong><code data-src="`a`">a</code></strong>'], '']);
50
+ assert.deepStrictEqual(inspect(parser, input('**(*a*)**')), [['<strong><span class="paren">(<em>a</em>)</span></strong>'], '']);
51
+ assert.deepStrictEqual(inspect(parser, input('**(**a**)**')), [['<strong><span class="paren">(<strong>a</strong>)</span></strong>'], '']);
53
52
  });
54
53
 
55
54
  });
@@ -1,7 +1,7 @@
1
1
  import { StrongParser } from '../inline';
2
2
  import { Recursion } from '../context';
3
- import { List, Node } from '../../combinator/data/parser';
4
- import { union, some, recursion, precedence, surround, lazy } from '../../combinator';
3
+ import { List, Node } from '../../combinator/parser';
4
+ import { union, some, recursion, precedence, backtrack, surround, lazy } from '../../combinator';
5
5
  import { inline } from '../inline';
6
6
  import { emphasis } from './emphasis';
7
7
  import { str } from '../source';
@@ -9,7 +9,7 @@ import { beforeNonblankWith, afterNonblank } from '../visibility';
9
9
  import { unwrap } from '../util';
10
10
  import { html, defrag } from 'typed-dom/dom';
11
11
 
12
- export const strong: StrongParser = lazy(() => surround(
12
+ export const strong: StrongParser = lazy(() => backtrack(surround(
13
13
  str('**', beforeNonblankWith(/(?!\*)/)),
14
14
  precedence(0, recursion(Recursion.inline,
15
15
  some(union([
@@ -18,5 +18,5 @@ export const strong: StrongParser = lazy(() => surround(
18
18
  ])))),
19
19
  str('**'),
20
20
  false, [],
21
- ([, bs]) => new List([new Node(html('strong', defrag(unwrap(bs))))]),
22
- ([as, bs]) => bs && as.import(bs as List<Node<string>>)));
21
+ ([, bs], _, output) => output.append(new Node(html('strong', defrag(unwrap(bs))))),
22
+ ([as, bs], _, output) => bs && output.import(as.import(bs as List<Node<string>>)))));
@@ -1,7 +1,6 @@
1
1
  import { template } from './template';
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/template', () => {
@@ -9,33 +8,33 @@ describe('Unit: parser/inline/template', () => {
9
8
  const parser = some(template);
10
9
 
11
10
  it('invalid', () => {
12
- assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
13
- assert.deepStrictEqual(inspect(parser, input('{', new Context())), undefined);
14
- assert.deepStrictEqual(inspect(parser, input('{}', new Context())), undefined);
15
- assert.deepStrictEqual(inspect(parser, input('{{', new Context())), undefined);
16
- assert.deepStrictEqual(inspect(parser, input('{{\\}}', new Context())), [['<span class="invalid">{{\\}</span>'], '}']);
17
- assert.deepStrictEqual(inspect(parser, input('{{a}b}', new Context())), [['<span class="invalid">{{a</span>'], '}b}']);
18
- assert.deepStrictEqual(inspect(parser, input('{{{a}}', new Context())), [['<span class="invalid">{{{a}</span>'], '}']);
19
- assert.deepStrictEqual(inspect(parser, input(' {{}}', new Context())), undefined);
11
+ assert.deepStrictEqual(inspect(parser, input('')), undefined);
12
+ assert.deepStrictEqual(inspect(parser, input('{')), undefined);
13
+ assert.deepStrictEqual(inspect(parser, input('{}')), undefined);
14
+ assert.deepStrictEqual(inspect(parser, input('{{')), undefined);
15
+ assert.deepStrictEqual(inspect(parser, input('{{\\}}')), [['<span class="invalid">{{\\}</span>'], '}']);
16
+ assert.deepStrictEqual(inspect(parser, input('{{a}b}')), [['<span class="invalid">{{a</span>'], '}b}']);
17
+ assert.deepStrictEqual(inspect(parser, input('{{{a}}')), [['<span class="invalid">{{{a}</span>'], '}']);
18
+ assert.deepStrictEqual(inspect(parser, input(' {{}}')), undefined);
20
19
  });
21
20
 
22
21
  it('basic', () => {
23
- assert.deepStrictEqual(inspect(parser, input('{{}}', new Context())), [['<span class="template">{{}}</span>'], '']);
24
- assert.deepStrictEqual(inspect(parser, input('{{}}}', new Context())), [['<span class="template">{{}}</span>'], '}']);
25
- assert.deepStrictEqual(inspect(parser, input('{{ }}', new Context())), [['<span class="template">{{ }}</span>'], '']);
26
- assert.deepStrictEqual(inspect(parser, input('{{ a }}', new Context())), [['<span class="template">{{ a }}</span>'], '']);
27
- assert.deepStrictEqual(inspect(parser, input('{{\n}}', new Context())), [['<span class="template">{{<br>}}</span>'], '']);
28
- assert.deepStrictEqual(inspect(parser, input('{{\\\n}}', new Context())), [['<span class="template">{{\\<br>}}</span>'], '']);
29
- assert.deepStrictEqual(inspect(parser, input('{{a}}', new Context())), [['<span class="template">{{a}}</span>'], '']);
30
- assert.deepStrictEqual(inspect(parser, input('{{a b}}', new Context())), [['<span class="template">{{a b}}</span>'], '']);
31
- assert.deepStrictEqual(inspect(parser, input('{{\\}}}', new Context())), [['<span class="template">{{\\}}}</span>'], '']);
32
- assert.deepStrictEqual(inspect(parser, input('{{<a>}}', new Context())), [['<span class="template">{{&lt;a&gt;}}</span>'], '']);
22
+ assert.deepStrictEqual(inspect(parser, input('{{}}')), [['<span class="template">{{}}</span>'], '']);
23
+ assert.deepStrictEqual(inspect(parser, input('{{}}}')), [['<span class="template">{{}}</span>'], '}']);
24
+ assert.deepStrictEqual(inspect(parser, input('{{ }}')), [['<span class="template">{{ }}</span>'], '']);
25
+ assert.deepStrictEqual(inspect(parser, input('{{ a }}')), [['<span class="template">{{ a }}</span>'], '']);
26
+ assert.deepStrictEqual(inspect(parser, input('{{\n}}')), [['<span class="template">{{<br>}}</span>'], '']);
27
+ assert.deepStrictEqual(inspect(parser, input('{{\\\n}}')), [['<span class="template">{{\\<br>}}</span>'], '']);
28
+ assert.deepStrictEqual(inspect(parser, input('{{a}}')), [['<span class="template">{{a}}</span>'], '']);
29
+ assert.deepStrictEqual(inspect(parser, input('{{a b}}')), [['<span class="template">{{a b}}</span>'], '']);
30
+ assert.deepStrictEqual(inspect(parser, input('{{\\}}}')), [['<span class="template">{{\\}}}</span>'], '']);
31
+ assert.deepStrictEqual(inspect(parser, input('{{<a>}}')), [['<span class="template">{{&lt;a&gt;}}</span>'], '']);
33
32
  });
34
33
 
35
34
  it('nest', () => {
36
- assert.deepStrictEqual(inspect(parser, input('{{`a`}}', new Context())), [['<span class="template">{{`a`}}</span>'], '']);
37
- assert.deepStrictEqual(inspect(parser, input('{{{a}}}', new Context())), [['<span class="template">{{{a}}}</span>'], '']);
38
- assert.deepStrictEqual(inspect(parser, input('{{{{a}}}}', new Context())), [['<span class="template">{{{{a}}}}</span>'], '']);
35
+ assert.deepStrictEqual(inspect(parser, input('{{`a`}}')), [['<span class="template">{{`a`}}</span>'], '']);
36
+ assert.deepStrictEqual(inspect(parser, input('{{{a}}}')), [['<span class="template">{{{a}}}</span>'], '']);
37
+ assert.deepStrictEqual(inspect(parser, input('{{{{a}}}}')), [['<span class="template">{{{{a}}}}</span>'], '']);
39
38
  });
40
39
 
41
40
  });
@@ -1,42 +1,39 @@
1
1
  import { TemplateParser } from '../inline';
2
2
  import { Recursion } from '../context';
3
- import { List, Node } from '../../combinator/data/parser';
4
- import { union, some, recursion, precedence, surround, lazy } from '../../combinator';
3
+ import { List, Node } from '../../combinator/parser';
4
+ import { union, some, recursion, precedence, backtrack, surround, lazy } from '../../combinator';
5
5
  import { escsource, str } from '../source';
6
6
  import { unwrap, invalid } from '../util';
7
7
  import { html, defrag } from 'typed-dom/dom';
8
8
 
9
- export const template: TemplateParser = lazy(() => surround(
9
+ export const template: TemplateParser = lazy(() => backtrack(surround(
10
10
  str('{{'),
11
11
  precedence(1,
12
12
  some(union([bracket, escsource]), '}')),
13
13
  str('}}'),
14
14
  true, [],
15
- ([as, bs = new List(), cs]) => new List([
16
- new Node(html('span', { class: 'template' }, defrag(unwrap(as.import(bs as List<Node<string>>).import(cs)))))
17
- ]),
18
- ([, bs], context) =>
19
- bs && new List([
15
+ ([as, bs = new List(), cs], _, output) =>
16
+ output.append(new Node(
17
+ html('span', { class: 'template' }, defrag(unwrap(as.import(bs as List<Node<string>>).import(cs)))))),
18
+ ([, bs], input, output) =>
19
+ bs && output.append(
20
20
  new Node(html('span',
21
21
  {
22
22
  class: 'invalid',
23
23
  ...invalid('template', 'syntax', `Missing the closing symbol "}}"`),
24
24
  },
25
- context.source.slice(context.position - context.range, context.position)))
26
- ])));
25
+ input.source.slice(input.position - input.range, input.position)))))));
27
26
 
28
27
  const bracket: TemplateParser.BracketParser = lazy(() => union([
29
28
  surround(str('('), recursion(Recursion.terminal, some(union([bracket, escsource]), ')')), str(')'),
30
- true, [], undefined, ([as, bs]) => bs && as.import(bs as List<Node<string>>)),
29
+ true, [], undefined, ([as, bs], _, output) => bs && output.import(as.import(bs as List<Node<string>>))),
31
30
  surround(str('['), recursion(Recursion.terminal, some(union([bracket, escsource]), ']')), str(']'),
32
- true, [], undefined, ([as, bs]) => bs && as.import(bs as List<Node<string>>)),
31
+ true, [], undefined, ([as, bs], _, output) => bs && output.import(as.import(bs as List<Node<string>>))),
33
32
  surround(str('{'), recursion(Recursion.terminal, some(union([bracket, escsource]), '}')), str('}'),
34
- true, [], undefined, ([as, bs]) => bs && as.import(bs as List<Node<string>>)),
33
+ true, [], undefined, ([as, bs], _, output) => bs && output.import(as.import(bs as List<Node<string>>))),
35
34
  surround(
36
35
  str('"'),
37
36
  precedence(2, recursion(Recursion.terminal, some(escsource, /["\n]/y, [['"', 2], ['\n', 3]]))),
38
37
  str('"'),
39
- true, [],
40
- undefined,
41
- ([as, bs]) => bs && as.import(bs as List<Node<string>>)),
38
+ true, [], undefined, ([as, bs], _, output) => bs && output.import(as.import(bs as List<Node<string>>))),
42
39
  ]));