securemark 0.291.0 → 0.292.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (164) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/design.md +13 -2
  3. package/dist/index.js +1101 -760
  4. package/markdown.d.ts +17 -17
  5. package/package.json +1 -1
  6. package/src/combinator/control/constraint/block.test.ts +8 -5
  7. package/src/combinator/control/constraint/block.ts +9 -9
  8. package/src/combinator/control/constraint/contract.ts +20 -28
  9. package/src/combinator/control/constraint/line.test.ts +9 -6
  10. package/src/combinator/control/constraint/line.ts +21 -22
  11. package/src/combinator/control/manipulation/convert.ts +29 -13
  12. package/src/combinator/control/manipulation/fence.ts +18 -15
  13. package/src/combinator/control/manipulation/indent.test.ts +17 -14
  14. package/src/combinator/control/manipulation/indent.ts +21 -10
  15. package/src/combinator/control/manipulation/match.ts +11 -10
  16. package/src/combinator/control/manipulation/recovery.ts +6 -2
  17. package/src/combinator/control/manipulation/scope.ts +37 -38
  18. package/src/combinator/control/manipulation/surround.ts +78 -60
  19. package/src/combinator/control/manipulation/trim.test.ts +12 -9
  20. package/src/combinator/control/monad/bind.ts +16 -16
  21. package/src/combinator/control/monad/fmap.ts +6 -6
  22. package/src/combinator/data/parser/context/delimiter.ts +8 -7
  23. package/src/combinator/data/parser/context.test.ts +19 -14
  24. package/src/combinator/data/parser/context.ts +20 -16
  25. package/src/combinator/data/parser/inits.ts +13 -14
  26. package/src/combinator/data/parser/sequence.test.ts +16 -15
  27. package/src/combinator/data/parser/sequence.ts +13 -14
  28. package/src/combinator/data/parser/some.test.ts +19 -18
  29. package/src/combinator/data/parser/some.ts +13 -15
  30. package/src/combinator/data/parser/subsequence.test.ts +22 -21
  31. package/src/combinator/data/parser/subsequence.ts +3 -3
  32. package/src/combinator/data/parser/tails.ts +3 -3
  33. package/src/combinator/data/parser/union.test.ts +16 -15
  34. package/src/combinator/data/parser/union.ts +2 -2
  35. package/src/combinator/data/parser.ts +66 -28
  36. package/src/debug.test.ts +3 -3
  37. package/src/parser/api/bind.ts +3 -3
  38. package/src/parser/api/header.ts +7 -6
  39. package/src/parser/api/normalize.ts +2 -2
  40. package/src/parser/api/parse.test.ts +14 -15
  41. package/src/parser/api/parse.ts +3 -3
  42. package/src/parser/autolink.test.ts +19 -17
  43. package/src/parser/block/blockquote.test.ts +86 -84
  44. package/src/parser/block/blockquote.ts +4 -2
  45. package/src/parser/block/codeblock.test.ts +58 -56
  46. package/src/parser/block/codeblock.ts +3 -3
  47. package/src/parser/block/dlist.test.ts +58 -56
  48. package/src/parser/block/extension/aside.test.ts +10 -8
  49. package/src/parser/block/extension/aside.ts +1 -1
  50. package/src/parser/block/extension/example.test.ts +20 -18
  51. package/src/parser/block/extension/example.ts +3 -3
  52. package/src/parser/block/extension/fig.test.ts +38 -36
  53. package/src/parser/block/extension/fig.ts +1 -1
  54. package/src/parser/block/extension/figbase.test.ts +17 -15
  55. package/src/parser/block/extension/figure.test.ts +64 -62
  56. package/src/parser/block/extension/figure.ts +3 -2
  57. package/src/parser/block/extension/message.test.ts +15 -13
  58. package/src/parser/block/extension/message.ts +3 -3
  59. package/src/parser/block/extension/placeholder.test.ts +3 -1
  60. package/src/parser/block/extension/table.test.ts +73 -71
  61. package/src/parser/block/extension/table.ts +5 -5
  62. package/src/parser/block/extension.test.ts +3 -1
  63. package/src/parser/block/heading.test.ts +65 -64
  64. package/src/parser/block/heading.ts +3 -3
  65. package/src/parser/block/ilist.test.ts +3 -1
  66. package/src/parser/block/ilist.ts +3 -3
  67. package/src/parser/block/mathblock.test.ts +33 -31
  68. package/src/parser/block/mathblock.ts +1 -1
  69. package/src/parser/block/mediablock.ts +2 -2
  70. package/src/parser/block/olist.test.ts +99 -97
  71. package/src/parser/block/olist.ts +2 -2
  72. package/src/parser/block/pagebreak.test.ts +17 -15
  73. package/src/parser/block/pagebreak.ts +1 -1
  74. package/src/parser/block/paragraph.test.ts +60 -57
  75. package/src/parser/block/reply/cite.test.ts +41 -39
  76. package/src/parser/block/reply/cite.ts +3 -3
  77. package/src/parser/block/reply/quote.test.ts +52 -50
  78. package/src/parser/block/reply.test.ts +21 -19
  79. package/src/parser/block/sidefence.test.ts +51 -49
  80. package/src/parser/block/table.test.ts +51 -50
  81. package/src/parser/block/table.ts +6 -6
  82. package/src/parser/block/ulist.test.ts +52 -50
  83. package/src/parser/block/ulist.ts +2 -2
  84. package/src/parser/block.ts +6 -5
  85. package/src/parser/context.ts +1 -0
  86. package/src/parser/header.test.ts +22 -21
  87. package/src/parser/header.ts +25 -13
  88. package/src/parser/inline/annotation.test.ts +44 -42
  89. package/src/parser/inline/annotation.ts +2 -2
  90. package/src/parser/inline/autolink/account.test.ts +32 -30
  91. package/src/parser/inline/autolink/account.ts +1 -1
  92. package/src/parser/inline/autolink/anchor.test.ts +23 -21
  93. package/src/parser/inline/autolink/anchor.ts +1 -1
  94. package/src/parser/inline/autolink/channel.test.ts +16 -14
  95. package/src/parser/inline/autolink/channel.ts +2 -2
  96. package/src/parser/inline/autolink/email.test.ts +38 -36
  97. package/src/parser/inline/autolink/email.ts +2 -2
  98. package/src/parser/inline/autolink/hashnum.test.ts +39 -37
  99. package/src/parser/inline/autolink/hashnum.ts +1 -1
  100. package/src/parser/inline/autolink/hashtag.test.ts +58 -56
  101. package/src/parser/inline/autolink/hashtag.ts +1 -1
  102. package/src/parser/inline/autolink/url.test.ts +76 -74
  103. package/src/parser/inline/autolink/url.ts +6 -6
  104. package/src/parser/inline/bracket.test.ts +69 -67
  105. package/src/parser/inline/bracket.ts +32 -32
  106. package/src/parser/inline/code.test.ts +32 -29
  107. package/src/parser/inline/code.ts +20 -13
  108. package/src/parser/inline/deletion.test.ts +29 -27
  109. package/src/parser/inline/deletion.ts +2 -2
  110. package/src/parser/inline/emphasis.test.ts +40 -36
  111. package/src/parser/inline/emphasis.ts +2 -2
  112. package/src/parser/inline/emstrong.test.ts +102 -96
  113. package/src/parser/inline/emstrong.ts +96 -36
  114. package/src/parser/inline/extension/index.test.ts +91 -89
  115. package/src/parser/inline/extension/index.ts +18 -30
  116. package/src/parser/inline/extension/indexee.ts +1 -1
  117. package/src/parser/inline/extension/indexer.test.ts +26 -24
  118. package/src/parser/inline/extension/indexer.ts +1 -1
  119. package/src/parser/inline/extension/label.test.ts +34 -32
  120. package/src/parser/inline/extension/placeholder.test.ts +44 -42
  121. package/src/parser/inline/extension/placeholder.ts +11 -8
  122. package/src/parser/inline/html.test.ts +108 -106
  123. package/src/parser/inline/html.ts +24 -23
  124. package/src/parser/inline/htmlentity.test.ts +39 -37
  125. package/src/parser/inline/htmlentity.ts +9 -3
  126. package/src/parser/inline/insertion.test.ts +29 -27
  127. package/src/parser/inline/insertion.ts +2 -2
  128. package/src/parser/inline/italic.test.ts +55 -53
  129. package/src/parser/inline/italic.ts +2 -2
  130. package/src/parser/inline/link.test.ts +187 -185
  131. package/src/parser/inline/link.ts +30 -12
  132. package/src/parser/inline/mark.test.ts +31 -29
  133. package/src/parser/inline/mark.ts +3 -3
  134. package/src/parser/inline/math.test.ts +133 -131
  135. package/src/parser/inline/math.ts +2 -2
  136. package/src/parser/inline/media.test.ts +93 -91
  137. package/src/parser/inline/media.ts +41 -17
  138. package/src/parser/inline/reference.test.ts +110 -108
  139. package/src/parser/inline/reference.ts +49 -40
  140. package/src/parser/inline/remark.test.ts +53 -51
  141. package/src/parser/inline/remark.ts +3 -3
  142. package/src/parser/inline/ruby.test.ts +46 -44
  143. package/src/parser/inline/ruby.ts +29 -32
  144. package/src/parser/inline/shortmedia.test.ts +11 -9
  145. package/src/parser/inline/strong.test.ts +37 -33
  146. package/src/parser/inline/strong.ts +6 -3
  147. package/src/parser/inline/template.test.ts +24 -22
  148. package/src/parser/inline/template.ts +20 -11
  149. package/src/parser/inline.test.ts +221 -220
  150. package/src/parser/inline.ts +13 -8
  151. package/src/parser/segment.ts +13 -8
  152. package/src/parser/source/escapable.test.ts +24 -22
  153. package/src/parser/source/escapable.ts +26 -41
  154. package/src/parser/source/line.test.ts +19 -17
  155. package/src/parser/source/line.ts +3 -3
  156. package/src/parser/source/str.ts +28 -11
  157. package/src/parser/source/text.test.ts +85 -83
  158. package/src/parser/source/text.ts +26 -54
  159. package/src/parser/source/unescapable.test.ts +24 -22
  160. package/src/parser/source/unescapable.ts +18 -33
  161. package/src/parser/source.ts +1 -1
  162. package/src/parser/util.ts +36 -33
  163. package/src/parser/visibility.ts +19 -15
  164. package/src/util/quote.ts +4 -2
@@ -1,58 +1,60 @@
1
1
  import { ruby } from './ruby';
2
2
  import { some } from '../../combinator';
3
+ import { input } from '../../combinator/data/parser';
3
4
  import { inspect } from '../../debug.test';
4
5
 
5
6
  describe('Unit: parser/inline/ruby', () => {
6
7
  describe('ruby', () => {
7
- const parser = (source: string) => some(ruby)({ source, context: {} });
8
+ const parser = (source: string) => some(ruby)(input(source, ctx));
9
+ const { context: ctx } = input('', {});
8
10
 
9
11
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('')), undefined);
11
- assert.deepStrictEqual(inspect(parser('[(b)')), undefined);
12
- assert.deepStrictEqual(inspect(parser('[]()')), undefined);
13
- assert.deepStrictEqual(inspect(parser('[](b)')), undefined);
14
- assert.deepStrictEqual(inspect(parser('[ ](b)')), undefined);
15
- assert.deepStrictEqual(inspect(parser('[ a](b)')), undefined);
16
- assert.deepStrictEqual(inspect(parser('[	a](b)')), undefined);
17
- assert.deepStrictEqual(inspect(parser('[	 a](b)')), undefined);
18
- assert.deepStrictEqual(inspect(parser('[&a;](b)')), [['<ruby>&amp;a;<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
19
- assert.deepStrictEqual(inspect(parser('[a](&a;)')), [['<ruby>a<rp>(</rp><rt>&amp;a;</rt><rp>)</rp></ruby>'], '']);
20
- assert.deepStrictEqual(inspect(parser('[<wbr>](a)')), undefined);
21
- assert.deepStrictEqual(inspect(parser('[a](<wbr>)')), undefined);
22
- assert.deepStrictEqual(inspect(parser('[a]()')), undefined);
23
- assert.deepStrictEqual(inspect(parser('[a]( )')), undefined);
24
- assert.deepStrictEqual(inspect(parser('[a\nb](c)')), undefined);
25
- assert.deepStrictEqual(inspect(parser('[a](b\nc)')), undefined);
26
- assert.deepStrictEqual(inspect(parser(' [a](b)')), undefined);
12
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
+ assert.deepStrictEqual(inspect(parser('[(b)'), ctx), undefined);
14
+ assert.deepStrictEqual(inspect(parser('[]()'), ctx), undefined);
15
+ assert.deepStrictEqual(inspect(parser('[](b)'), ctx), undefined);
16
+ assert.deepStrictEqual(inspect(parser('[ ](b)'), ctx), undefined);
17
+ assert.deepStrictEqual(inspect(parser('[ a](b)'), ctx), undefined);
18
+ assert.deepStrictEqual(inspect(parser('[&Tab;a](b)'), ctx), undefined);
19
+ assert.deepStrictEqual(inspect(parser('[&Tab; a](b)'), ctx), undefined);
20
+ assert.deepStrictEqual(inspect(parser('[&a;](b)'), ctx), [['<ruby>&amp;a;<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
21
+ assert.deepStrictEqual(inspect(parser('[a](&a;)'), ctx), [['<ruby>a<rp>(</rp><rt>&amp;a;</rt><rp>)</rp></ruby>'], '']);
22
+ assert.deepStrictEqual(inspect(parser('[<wbr>](a)'), ctx), undefined);
23
+ assert.deepStrictEqual(inspect(parser('[a](<wbr>)'), ctx), undefined);
24
+ assert.deepStrictEqual(inspect(parser('[a]()'), ctx), undefined);
25
+ assert.deepStrictEqual(inspect(parser('[a]( )'), ctx), undefined);
26
+ assert.deepStrictEqual(inspect(parser('[a\nb](c)'), ctx), undefined);
27
+ assert.deepStrictEqual(inspect(parser('[a](b\nc)'), ctx), undefined);
28
+ assert.deepStrictEqual(inspect(parser(' [a](b)'), ctx), undefined);
27
29
  });
28
30
 
29
31
  it('basic', () => {
30
- assert.deepStrictEqual(inspect(parser('[A](a)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
31
- assert.deepStrictEqual(inspect(parser('[A](ab)')), [['<ruby>A<rp>(</rp><rt>ab</rt><rp>)</rp></ruby>'], '']);
32
- assert.deepStrictEqual(inspect(parser('[A](a b)')), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
33
- assert.deepStrictEqual(inspect(parser('[A ](a)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
34
- assert.deepStrictEqual(inspect(parser('[A ](a b)')), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
35
- assert.deepStrictEqual(inspect(parser('[A ](a b )')), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
36
- assert.deepStrictEqual(inspect(parser('[A ](a)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp><rt></rt></ruby>'], '']);
37
- assert.deepStrictEqual(inspect(parser('[A \\ ](a)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp> <rt></rt></ruby>'], '']);
38
- assert.deepStrictEqual(inspect(parser('[AB](a)')), [['<ruby>AB<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
39
- assert.deepStrictEqual(inspect(parser('[AB](a )')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt></ruby>'], '']);
40
- assert.deepStrictEqual(inspect(parser('[AB]( b)')), [['<ruby>A<rt></rt>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
41
- assert.deepStrictEqual(inspect(parser('[AB](ab)')), [['<ruby>AB<rp>(</rp><rt>ab</rt><rp>)</rp></ruby>'], '']);
42
- assert.deepStrictEqual(inspect(parser('[AB](a b)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
43
- assert.deepStrictEqual(inspect(parser('[AB](a b )')), [['<ruby>AB<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
44
- assert.deepStrictEqual(inspect(parser('[AB](a b c)')), [['<ruby>AB<rp>(</rp><rt>a b c</rt><rp>)</rp></ruby>'], '']);
45
- assert.deepStrictEqual(inspect(parser('[A B](ab)')), [['<ruby>A<rp>(</rp><rt>ab</rt><rp>)</rp>B<rt></rt></ruby>'], '']);
46
- assert.deepStrictEqual(inspect(parser('[A B](a b)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
47
- assert.deepStrictEqual(inspect(parser('[ABC]( b )')), [['<ruby>A<rt></rt>B<rp>(</rp><rt>b</rt><rp>)</rp>C<rt></rt></ruby>'], '']);
48
- assert.deepStrictEqual(inspect(parser('[ABC](a c)')), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt>C<rp>(</rp><rt>c</rt><rp>)</rp></ruby>'], '']);
49
- assert.deepStrictEqual(inspect(parser('[東方](とう ほう)')), [['<ruby>東<rp>(</rp><rt>とう</rt><rp>)</rp>方<rp>(</rp><rt>ほう</rt><rp>)</rp></ruby>'], '']);
50
- assert.deepStrictEqual(inspect(parser('[秦 \\  こころ](はた の こころ)')), [['<ruby>秦<rp>(</rp><rt>はた</rt><rp>)</rp> <rp>(</rp><rt>の</rt><rp>)</rp>こころ<rp>(</rp><rt>こころ</rt><rp>)</rp></ruby>'], '']);
51
- assert.deepStrictEqual(inspect(parser('[秦 &nbsp; こころ](はた の こころ)')), [['<ruby>秦<rp>(</rp><rt>はた</rt><rp>)</rp>&nbsp;<rp>(</rp><rt>の</rt><rp>)</rp>こころ<rp>(</rp><rt>こころ</rt><rp>)</rp></ruby>'], '']);
52
- assert.deepStrictEqual(inspect(parser('[&&](&&)')), [['<ruby>&amp;&amp;<rp>(</rp><rt>&amp;&amp;</rt><rp>)</rp></ruby>'], '']);
53
- assert.deepStrictEqual(inspect(parser('[&copy;](&copy;)')), [['<ruby>©<rp>(</rp><rt>©</rt><rp>)</rp></ruby>'], '']);
54
- assert.deepStrictEqual(inspect(parser('[&amp;copy;](&amp;copy;)')), [['<ruby>&amp;copy;<rp>(</rp><rt>&amp;copy;</rt><rp>)</rp></ruby>'], '']);
55
- assert.deepStrictEqual(inspect(parser('[*A*](*a*)')), [['<ruby>*A*<rp>(</rp><rt>*a*</rt><rp>)</rp></ruby>'], '']);
32
+ assert.deepStrictEqual(inspect(parser('[A](a)'), ctx), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
33
+ assert.deepStrictEqual(inspect(parser('[A](ab)'), ctx), [['<ruby>A<rp>(</rp><rt>ab</rt><rp>)</rp></ruby>'], '']);
34
+ assert.deepStrictEqual(inspect(parser('[A](a b)'), ctx), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
35
+ assert.deepStrictEqual(inspect(parser('[A ](a)'), ctx), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('[A ](a b)'), ctx), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
37
+ assert.deepStrictEqual(inspect(parser('[A ](a b )'), ctx), [['<ruby>A<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('[A ](a)'), ctx), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp><rt></rt></ruby>'], '']);
39
+ assert.deepStrictEqual(inspect(parser('[A \\ ](a)'), ctx), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp> <rt></rt></ruby>'], '']);
40
+ assert.deepStrictEqual(inspect(parser('[AB](a)'), ctx), [['<ruby>AB<rp>(</rp><rt>a</rt><rp>)</rp></ruby>'], '']);
41
+ assert.deepStrictEqual(inspect(parser('[AB](a )'), ctx), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt></ruby>'], '']);
42
+ assert.deepStrictEqual(inspect(parser('[AB]( b)'), ctx), [['<ruby>A<rt></rt>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('[AB](ab)'), ctx), [['<ruby>AB<rp>(</rp><rt>ab</rt><rp>)</rp></ruby>'], '']);
44
+ assert.deepStrictEqual(inspect(parser('[AB](a b)'), ctx), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
45
+ assert.deepStrictEqual(inspect(parser('[AB](a b )'), ctx), [['<ruby>AB<rp>(</rp><rt>a b</rt><rp>)</rp></ruby>'], '']);
46
+ assert.deepStrictEqual(inspect(parser('[AB](a b c)'), ctx), [['<ruby>AB<rp>(</rp><rt>a b c</rt><rp>)</rp></ruby>'], '']);
47
+ assert.deepStrictEqual(inspect(parser('[A B](ab)'), ctx), [['<ruby>A<rp>(</rp><rt>ab</rt><rp>)</rp>B<rt></rt></ruby>'], '']);
48
+ assert.deepStrictEqual(inspect(parser('[A B](a b)'), ctx), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
49
+ assert.deepStrictEqual(inspect(parser('[ABC]( b )'), ctx), [['<ruby>A<rt></rt>B<rp>(</rp><rt>b</rt><rp>)</rp>C<rt></rt></ruby>'], '']);
50
+ assert.deepStrictEqual(inspect(parser('[ABC](a c)'), ctx), [['<ruby>A<rp>(</rp><rt>a</rt><rp>)</rp>B<rt></rt>C<rp>(</rp><rt>c</rt><rp>)</rp></ruby>'], '']);
51
+ assert.deepStrictEqual(inspect(parser('[東方](とう ほう)'), ctx), [['<ruby>東<rp>(</rp><rt>とう</rt><rp>)</rp>方<rp>(</rp><rt>ほう</rt><rp>)</rp></ruby>'], '']);
52
+ assert.deepStrictEqual(inspect(parser('[秦 \\  こころ](はた の こころ)'), ctx), [['<ruby>秦<rp>(</rp><rt>はた</rt><rp>)</rp> <rp>(</rp><rt>の</rt><rp>)</rp>こころ<rp>(</rp><rt>こころ</rt><rp>)</rp></ruby>'], '']);
53
+ assert.deepStrictEqual(inspect(parser('[秦 &nbsp; こころ](はた の こころ)'), ctx), [['<ruby>秦<rp>(</rp><rt>はた</rt><rp>)</rp>&nbsp;<rp>(</rp><rt>の</rt><rp>)</rp>こころ<rp>(</rp><rt>こころ</rt><rp>)</rp></ruby>'], '']);
54
+ assert.deepStrictEqual(inspect(parser('[&&](&&)'), ctx), [['<ruby>&amp;&amp;<rp>(</rp><rt>&amp;&amp;</rt><rp>)</rp></ruby>'], '']);
55
+ assert.deepStrictEqual(inspect(parser('[&copy;](&copy;)'), ctx), [['<ruby>©<rp>(</rp><rt>©</rt><rp>)</rp></ruby>'], '']);
56
+ assert.deepStrictEqual(inspect(parser('[&amp;copy;](&amp;copy;)'), ctx), [['<ruby>&amp;copy;<rp>(</rp><rt>&amp;copy;</rt><rp>)</rp></ruby>'], '']);
57
+ assert.deepStrictEqual(inspect(parser('[*A*](*a*)'), ctx), [['<ruby>*A*<rp>(</rp><rt>*a*</rt><rp>)</rp></ruby>'], '']);
56
58
  });
57
59
 
58
60
  });
@@ -1,9 +1,9 @@
1
1
  import { RubyParser } from '../inline';
2
2
  import { Backtrack } from '../context';
3
- import { eval, exec } from '../../combinator/data/parser';
3
+ import { eval } from '../../combinator/data/parser';
4
4
  import { inits, surround, setBacktrack, dup, lazy, bind } from '../../combinator';
5
5
  import { unsafehtmlentity } from './htmlentity';
6
- import { text } from '../source';
6
+ import { txt } from '../source';
7
7
  import { isTightNodeStart } from '../visibility';
8
8
  import { unshift, push } from 'spica/array';
9
9
  import { html, defrag } from 'typed-dom/dom';
@@ -11,22 +11,22 @@ import { html, defrag } from 'typed-dom/dom';
11
11
  export const ruby: RubyParser = lazy(() => bind(
12
12
  inits([
13
13
  dup(surround(
14
- '[', rtext, ']',
14
+ '[', text, ']',
15
15
  false,
16
- ([, ns], rest) => {
16
+ ([, ns]) => {
17
17
  ns && ns.at(-1) === '' && ns.pop();
18
- return isTightNodeStart(ns) ? [ns, rest] : undefined;
18
+ return isTightNodeStart(ns) ? [ns] : undefined;
19
19
  },
20
20
  undefined,
21
21
  [3 | Backtrack.ruby, 1 | Backtrack.bracket])),
22
22
  dup(surround(
23
- '(', rtext, ')',
23
+ '(', text, ')',
24
24
  false, undefined, undefined,
25
25
  [3 | Backtrack.ruby, 1 | Backtrack.bracket])),
26
26
  ]),
27
- ([texts, rubies], rest, context) => {
27
+ ([texts, rubies], context) => {
28
28
  if (rubies === undefined) {
29
- const head = context.recent!.reduce((a, b) => a + b.length, rest.length);
29
+ const head = context.position - context.range!;
30
30
  return void setBacktrack(context, [2 | Backtrack.ruby], head);
31
31
  }
32
32
  switch (true) {
@@ -40,7 +40,7 @@ export const ruby: RubyParser = lazy(() => bind(
40
40
  ? [html('rp', '('), html('rt', rubies[i]), html('rp', ')')]
41
41
  : [html('rt')]))
42
42
  , []))),
43
- ], rest];
43
+ ]];
44
44
  case texts.length === 1 && [...texts[0]].length >= rubies.length:
45
45
  return [[
46
46
  html('ruby', defrag([...texts[0]]
@@ -51,52 +51,49 @@ export const ruby: RubyParser = lazy(() => bind(
51
51
  ? [html('rp', '('), html('rt', rubies[i]), html('rp', ')')]
52
52
  : [html('rt')]))
53
53
  , []))),
54
- ], rest];
54
+ ]];
55
55
  default:
56
56
  assert(rubies.length > 0);
57
57
  return [[
58
58
  html('ruby', defrag(unshift(
59
59
  [texts.join(' ')],
60
60
  [html('rp', '('), html('rt', rubies.join(' ').trim()), html('rp', ')')]))),
61
- ], rest];
61
+ ]];
62
62
  }
63
63
  }));
64
64
 
65
- const rtext: RubyParser.TextParser = ({ source, context }) => {
65
+ const text: RubyParser.TextParser = input => {
66
+ const { context } = input;
67
+ const { source } = context;
66
68
  const acc = [''];
67
69
  let state = false;
68
- while (source !== '') {
69
- if (!/^(?:\\[^\n]|[^\\[\](){}<>"$#\n])/.test(source)) break;
70
- assert(source[0] !== '\n');
71
- switch (source[0]) {
72
- // @ts-expect-error
70
+ for (let { position } = context; position < source.length; position = context.position) {
71
+ if (!/^(?:\\[^\n]|[^\\[\](){}<>"`$#:^|\n])/.test(source.slice(position, position + 2))) break;
72
+ assert(source[position] !== '\n');
73
+ switch (source[position]) {
73
74
  case '&': {
74
- const result = unsafehtmlentity({ source, context });
75
- if (result) {
76
- acc[acc.length - 1] += eval(result)[0];
77
- source = exec(result) ?? source.slice(1);
78
- state ||= acc.at(-1)!.trimStart() !== '';
79
- continue;
80
- }
81
- // fallthrough
75
+ const result = unsafehtmlentity(input) ?? txt(input)!;
76
+ assert(result);
77
+ acc[acc.length - 1] += eval(result)[0];
78
+ continue;
82
79
  }
83
80
  default: {
84
- if (source[0].trimStart() === '') {
81
+ if (source[position].trimStart() === '') {
82
+ state ||= acc.at(-1)!.trimStart() !== '';
85
83
  acc.push('');
86
- source = source.slice(1);
84
+ context.position += 1;
87
85
  continue;
88
86
  }
89
- const result = text({ source, context })!;
87
+ const result = txt(input)!;
90
88
  assert(result);
91
- acc[acc.length - 1] += eval(result)[0] ?? source.slice(0, source.length - exec(result).length);
92
- source = exec(result);
93
- state ||= acc.at(-1)!.trimStart() !== '';
89
+ acc[acc.length - 1] += eval(result)[0] ?? source.slice(position, context.position);
94
90
  continue;
95
91
  }
96
92
  }
97
93
  }
94
+ state ||= acc.at(-1)!.trimStart() !== '';
98
95
  return state
99
- ? [acc, source]
96
+ ? [acc]
100
97
  : undefined;
101
98
  };
102
99
 
@@ -1,23 +1,25 @@
1
1
  import { shortmedia } from './shortmedia';
2
2
  import { some } from '../../combinator';
3
+ import { input } from '../../combinator/data/parser';
3
4
  import { inspect } from '../../debug.test';
4
5
 
5
6
  describe('Unit: parser/inline/shortmedia', () => {
6
7
  describe('shortmedia', () => {
7
- const parser = (source: string) => some(shortmedia)({ source, context: {} });
8
+ const parser = (source: string) => some(shortmedia)(input(source, ctx));
9
+ const { context: ctx } = input('', {});
8
10
 
9
11
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('')), undefined);
11
- assert.deepStrictEqual(inspect(parser('!http')), undefined);
12
- assert.deepStrictEqual(inspect(parser('!ttp')), undefined);
13
- assert.deepStrictEqual(inspect(parser('!http://')), undefined);
14
- assert.deepStrictEqual(inspect(parser('!Http://host')), undefined);
15
- assert.deepStrictEqual(inspect(parser(' !http://host')), undefined);
12
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
+ assert.deepStrictEqual(inspect(parser('!http'), ctx), undefined);
14
+ assert.deepStrictEqual(inspect(parser('!ttp'), ctx), undefined);
15
+ assert.deepStrictEqual(inspect(parser('!http://'), ctx), undefined);
16
+ assert.deepStrictEqual(inspect(parser('!Http://host'), ctx), undefined);
17
+ assert.deepStrictEqual(inspect(parser(' !http://host'), ctx), undefined);
16
18
  });
17
19
 
18
20
  it('basic', () => {
19
- assert.deepStrictEqual(inspect(parser('!http://host')), [['<a href="http://host" target="_blank"><img class="media" data-src="http://host" alt="http://host"></a>'], '']);
20
- assert.deepStrictEqual(inspect(parser('!https://host')), [['<a href="https://host" target="_blank"><img class="media" data-src="https://host" alt="https://host"></a>'], '']);
21
+ assert.deepStrictEqual(inspect(parser('!http://host'), ctx), [['<a href="http://host" target="_blank"><img class="media" data-src="http://host" alt="http://host"></a>'], '']);
22
+ assert.deepStrictEqual(inspect(parser('!https://host'), ctx), [['<a href="https://host" target="_blank"><img class="media" data-src="https://host" alt="https://host"></a>'], '']);
21
23
  });
22
24
 
23
25
  });
@@ -1,50 +1,54 @@
1
1
  import { strong } from './strong';
2
2
  import { some } from '../../combinator';
3
+ import { input } from '../../combinator/data/parser';
3
4
  import { inspect } from '../../debug.test';
4
5
 
5
6
  describe('Unit: parser/inline/strong', () => {
6
7
  describe('strong', () => {
7
- const parser = (source: string) => some(strong)({ source, context: {} });
8
+ const parser = (source: string) => some(strong)(input(source, ctx));
9
+ const { context: ctx } = input('', {});
8
10
 
9
11
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('**')), undefined);
11
- assert.deepStrictEqual(inspect(parser('**a')), [['**', 'a'], '']);
12
- assert.deepStrictEqual(inspect(parser('**a **')), [['**', 'a'], ' **']);
13
- assert.deepStrictEqual(inspect(parser('**a **')), [['**', 'a', ' '], ' **']);
14
- assert.deepStrictEqual(inspect(parser('**a\n**')), [['**', 'a'], '\n**']);
15
- assert.deepStrictEqual(inspect(parser('**a\\ **')), [['**', 'a'], '\\ **']);
16
- assert.deepStrictEqual(inspect(parser('**a\\\n**')), [['**', 'a'], '\\\n**']);
17
- assert.deepStrictEqual(inspect(parser('**a*')), [['**', 'a', '*'], '']);
18
- assert.deepStrictEqual(inspect(parser('**a*b**')), [['**', 'a', '<em>b</em>', '*'], '']);
19
- assert.deepStrictEqual(inspect(parser('** **')), undefined);
20
- assert.deepStrictEqual(inspect(parser('** a**')), undefined);
21
- assert.deepStrictEqual(inspect(parser('** a **')), undefined);
22
- assert.deepStrictEqual(inspect(parser('**\n**')), undefined);
23
- assert.deepStrictEqual(inspect(parser('**\na**')), undefined);
24
- assert.deepStrictEqual(inspect(parser('**\\ a**')), undefined);
25
- assert.deepStrictEqual(inspect(parser('**\\\na**')), undefined);
26
- assert.deepStrictEqual(inspect(parser('**<wbr>a**')), undefined);
27
- assert.deepStrictEqual(inspect(parser('***a***')), undefined);
28
- assert.deepStrictEqual(inspect(parser(' **a**')), undefined);
12
+ assert.deepStrictEqual(inspect(parser('**'), ctx), undefined);
13
+ assert.deepStrictEqual(inspect(parser('**a'), ctx), [['**', 'a'], '']);
14
+ assert.deepStrictEqual(inspect(parser('**a **'), ctx), [['**', 'a'], ' **']);
15
+ assert.deepStrictEqual(inspect(parser('**a **'), ctx), [['**', 'a', ' '], ' **']);
16
+ assert.deepStrictEqual(inspect(parser('**a\n**'), ctx), [['**', 'a'], '\n**']);
17
+ assert.deepStrictEqual(inspect(parser('**a\\ **'), ctx), [['**', 'a'], '\\ **']);
18
+ assert.deepStrictEqual(inspect(parser('**a\\\n**'), ctx), [['**', 'a'], '\\\n**']);
19
+ assert.deepStrictEqual(inspect(parser('**a*'), ctx), [['**', 'a'], '*']);
20
+ assert.deepStrictEqual(inspect(parser('**a*b**'), ctx), [['**', 'a', '<em>b</em>'], '*']);
21
+ assert.deepStrictEqual(inspect(parser('** **'), ctx), undefined);
22
+ assert.deepStrictEqual(inspect(parser('** a**'), ctx), undefined);
23
+ assert.deepStrictEqual(inspect(parser('** a **'), ctx), undefined);
24
+ assert.deepStrictEqual(inspect(parser('**\n**'), ctx), undefined);
25
+ assert.deepStrictEqual(inspect(parser('**\na**'), ctx), undefined);
26
+ assert.deepStrictEqual(inspect(parser('**\\ a**'), ctx), undefined);
27
+ assert.deepStrictEqual(inspect(parser('**\\\na**'), ctx), undefined);
28
+ assert.deepStrictEqual(inspect(parser('**<wbr>a**'), ctx), undefined);
29
+ assert.deepStrictEqual(inspect(parser('***a***'), ctx), undefined);
30
+ assert.deepStrictEqual(inspect(parser(' **a**'), ctx), undefined);
29
31
  });
30
32
 
31
33
  it('basic', () => {
32
- assert.deepStrictEqual(inspect(parser('**a**')), [['<strong>a</strong>'], '']);
33
- assert.deepStrictEqual(inspect(parser('**ab**')), [['<strong>ab</strong>'], '']);
34
- assert.deepStrictEqual(inspect(parser('**a\nb**')), [['<strong>a<br>b</strong>'], '']);
35
- assert.deepStrictEqual(inspect(parser('**a\\\nb**')), [['<strong>a<br>b</strong>'], '']);
34
+ assert.deepStrictEqual(inspect(parser('**a**'), ctx), [['<strong>a</strong>'], '']);
35
+ assert.deepStrictEqual(inspect(parser('**ab**'), ctx), [['<strong>ab</strong>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('**a\nb**'), ctx), [['<strong>a<br>b</strong>'], '']);
37
+ assert.deepStrictEqual(inspect(parser('**a\\\nb**'), ctx), [['<strong>a<br>b</strong>'], '']);
36
38
  });
37
39
 
38
40
  it('nest', () => {
39
- assert.deepStrictEqual(inspect(parser('**a *b***')), [['<strong>a <em>b</em></strong>'], '']);
40
- assert.deepStrictEqual(inspect(parser('**a **b****')), [['<strong>a <strong>b</strong></strong>'], '']);
41
- assert.deepStrictEqual(inspect(parser('**a&Tab;**b****')), [['<strong>a\t<strong>b</strong></strong>'], '']);
42
- assert.deepStrictEqual(inspect(parser('**a<wbr>**b****')), [['<strong>a<wbr><strong>b</strong></strong>'], '']);
43
- assert.deepStrictEqual(inspect(parser('**a*b*c**')), [['<strong>a<em>b</em>c</strong>'], '']);
44
- assert.deepStrictEqual(inspect(parser('**a*b*c**d')), [['<strong>a<em>b</em>c</strong>'], 'd']);
45
- assert.deepStrictEqual(inspect(parser('**`a`**')), [['<strong><code data-src="`a`">a</code></strong>'], '']);
46
- assert.deepStrictEqual(inspect(parser('**(*a*)**')), [['<strong><span class="paren">(<em>a</em>)</span></strong>'], '']);
47
- assert.deepStrictEqual(inspect(parser('**(**a**)**')), [['<strong><span class="paren">(<strong>a</strong>)</span></strong>'], '']);
41
+ assert.deepStrictEqual(inspect(parser('**a *b***'), ctx), [['<strong>a <em>b</em></strong>'], '']);
42
+ assert.deepStrictEqual(inspect(parser('**a **b****'), ctx), [['<strong>a <strong>b</strong></strong>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('**a&Tab;**b****'), ctx), [['<strong>a\t<strong>b</strong></strong>'], '']);
44
+ assert.deepStrictEqual(inspect(parser('**a<wbr>**b****'), ctx), [['<strong>a<wbr><strong>b</strong></strong>'], '']);
45
+ assert.deepStrictEqual(inspect(parser('**a*b*'), ctx), [['**', 'a', '<em>b</em>'], '']);
46
+ assert.deepStrictEqual(inspect(parser('**a*b*c'), ctx), [['**', 'a', '<em>b</em>', 'c'], '']);
47
+ assert.deepStrictEqual(inspect(parser('**a*b*c**'), ctx), [['<strong>a<em>b</em>c</strong>'], '']);
48
+ assert.deepStrictEqual(inspect(parser('**a*b*c**d'), ctx), [['<strong>a<em>b</em>c</strong>'], 'd']);
49
+ assert.deepStrictEqual(inspect(parser('**`a`**'), ctx), [['<strong><code data-src="`a`">a</code></strong>'], '']);
50
+ assert.deepStrictEqual(inspect(parser('**(*a*)**'), ctx), [['<strong><span class="paren">(<em>a</em>)</span></strong>'], '']);
51
+ assert.deepStrictEqual(inspect(parser('**(**a**)**'), ctx), [['<strong><span class="paren">(<strong>a</strong>)</span></strong>'], '']);
48
52
  });
49
53
 
50
54
  });
@@ -3,6 +3,7 @@ import { Recursion } from '../context';
3
3
  import { union, some, recursion, precedence, surround, open, lazy } from '../../combinator';
4
4
  import { inline } from '../inline';
5
5
  import { emstrong } from './emstrong';
6
+ import { emphasis } from './emphasis';
6
7
  import { str } from '../source';
7
8
  import { tightStart, blankWith } from '../visibility';
8
9
  import { unshift } from 'spica/array';
@@ -12,12 +13,14 @@ export const strong: StrongParser = lazy(() => surround(
12
13
  str('**', '*'),
13
14
  precedence(0, recursion(Recursion.inline,
14
15
  tightStart(some(union([
15
- some(inline, blankWith('**')),
16
+ emphasis,
17
+ some(inline, blankWith('*')),
16
18
  open(some(inline, '*'), union([
17
19
  emstrong,
18
20
  strong,
21
+ emphasis,
19
22
  ])),
20
23
  ]))))),
21
24
  str('**'), false,
22
- ([, bs], rest) => [[html('strong', defrag(bs))], rest],
23
- ([as, bs], rest) => [unshift(as, bs), rest]));
25
+ ([, bs]) => [[html('strong', defrag(bs))]],
26
+ ([as, bs]) => bs && [unshift(as, bs)]));
@@ -1,39 +1,41 @@
1
1
  import { template } from './template';
2
2
  import { some } from '../../combinator';
3
+ import { input } from '../../combinator/data/parser';
3
4
  import { inspect } from '../../debug.test';
4
5
 
5
6
  describe('Unit: parser/inline/template', () => {
6
7
  describe('template', () => {
7
- const parser = (source: string) => some(template)({ source, context: {} });
8
+ const parser = (source: string) => some(template)(input(source, ctx));
9
+ const { context: ctx } = input('', {});
8
10
 
9
11
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('')), undefined);
11
- assert.deepStrictEqual(inspect(parser('{')), undefined);
12
- assert.deepStrictEqual(inspect(parser('{}')), undefined);
13
- assert.deepStrictEqual(inspect(parser('{{')), undefined);
14
- assert.deepStrictEqual(inspect(parser('{{\\}}')), undefined);
15
- assert.deepStrictEqual(inspect(parser('{{a}b}')), undefined);
16
- assert.deepStrictEqual(inspect(parser('{{{a}}')), undefined);
17
- assert.deepStrictEqual(inspect(parser(' {{}}')), undefined);
12
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
+ assert.deepStrictEqual(inspect(parser('{'), ctx), undefined);
14
+ assert.deepStrictEqual(inspect(parser('{}'), ctx), undefined);
15
+ assert.deepStrictEqual(inspect(parser('{{'), ctx), undefined);
16
+ assert.deepStrictEqual(inspect(parser('{{\\}}'), ctx), [['<span class="invalid">{{\\}</span>'], '}']);
17
+ assert.deepStrictEqual(inspect(parser('{{a}b}'), ctx), [['<span class="invalid">{{a</span>'], '}b}']);
18
+ assert.deepStrictEqual(inspect(parser('{{{a}}'), ctx), [['<span class="invalid">{{{a}</span>'], '}']);
19
+ assert.deepStrictEqual(inspect(parser(' {{}}'), ctx), undefined);
18
20
  });
19
21
 
20
22
  it('basic', () => {
21
- assert.deepStrictEqual(inspect(parser('{{}}')), [['<span class="template">{{}}</span>'], '']);
22
- assert.deepStrictEqual(inspect(parser('{{}}}')), [['<span class="template">{{}}</span>'], '}']);
23
- assert.deepStrictEqual(inspect(parser('{{ }}')), [['<span class="template">{{ }}</span>'], '']);
24
- assert.deepStrictEqual(inspect(parser('{{ a }}')), [['<span class="template">{{ a }}</span>'], '']);
25
- assert.deepStrictEqual(inspect(parser('{{\n}}')), [['<span class="template">{{<br>}}</span>'], '']);
26
- assert.deepStrictEqual(inspect(parser('{{\\\n}}')), [['<span class="template">{{\\<br>}}</span>'], '']);
27
- assert.deepStrictEqual(inspect(parser('{{a}}')), [['<span class="template">{{a}}</span>'], '']);
28
- assert.deepStrictEqual(inspect(parser('{{a b}}')), [['<span class="template">{{a b}}</span>'], '']);
29
- assert.deepStrictEqual(inspect(parser('{{\\}}}')), [['<span class="template">{{\\}}}</span>'], '']);
30
- assert.deepStrictEqual(inspect(parser('{{<a>}}')), [['<span class="template">{{&lt;a&gt;}}</span>'], '']);
23
+ assert.deepStrictEqual(inspect(parser('{{}}'), ctx), [['<span class="template">{{}}</span>'], '']);
24
+ assert.deepStrictEqual(inspect(parser('{{}}}'), ctx), [['<span class="template">{{}}</span>'], '}']);
25
+ assert.deepStrictEqual(inspect(parser('{{ }}'), ctx), [['<span class="template">{{ }}</span>'], '']);
26
+ assert.deepStrictEqual(inspect(parser('{{ a }}'), ctx), [['<span class="template">{{ a }}</span>'], '']);
27
+ assert.deepStrictEqual(inspect(parser('{{\n}}'), ctx), [['<span class="template">{{<br>}}</span>'], '']);
28
+ assert.deepStrictEqual(inspect(parser('{{\\\n}}'), ctx), [['<span class="template">{{\\<br>}}</span>'], '']);
29
+ assert.deepStrictEqual(inspect(parser('{{a}}'), ctx), [['<span class="template">{{a}}</span>'], '']);
30
+ assert.deepStrictEqual(inspect(parser('{{a b}}'), ctx), [['<span class="template">{{a b}}</span>'], '']);
31
+ assert.deepStrictEqual(inspect(parser('{{\\}}}'), ctx), [['<span class="template">{{\\}}}</span>'], '']);
32
+ assert.deepStrictEqual(inspect(parser('{{<a>}}'), ctx), [['<span class="template">{{&lt;a&gt;}}</span>'], '']);
31
33
  });
32
34
 
33
35
  it('nest', () => {
34
- assert.deepStrictEqual(inspect(parser('{{`a`}}')), [['<span class="template">{{`a`}}</span>'], '']);
35
- assert.deepStrictEqual(inspect(parser('{{{a}}}')), [['<span class="template">{{{a}}}</span>'], '']);
36
- assert.deepStrictEqual(inspect(parser('{{{{a}}}}')), [['<span class="template">{{{{a}}}}</span>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('{{`a`}}'), ctx), [['<span class="template">{{`a`}}</span>'], '']);
37
+ assert.deepStrictEqual(inspect(parser('{{{a}}}'), ctx), [['<span class="template">{{{a}}}</span>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('{{{{a}}}}'), ctx), [['<span class="template">{{{{a}}}}</span>'], '']);
37
39
  });
38
40
 
39
41
  });
@@ -2,6 +2,7 @@ import { TemplateParser } from '../inline';
2
2
  import { Recursion, Backtrack } from '../context';
3
3
  import { union, some, recursion, precedence, surround, lazy } from '../../combinator';
4
4
  import { escsource, str } from '../source';
5
+ import { invalid } from '../util';
5
6
  import { unshift, push } from 'spica/array';
6
7
  import { html, defrag } from 'typed-dom/dom';
7
8
 
@@ -11,27 +12,35 @@ export const template: TemplateParser = lazy(() => surround(
11
12
  some(union([bracket, escsource]), '}')),
12
13
  str('}}'),
13
14
  true,
14
- ([as, bs = [], cs], rest) =>
15
- [[html('span', { class: 'template' }, defrag(push(unshift(as, bs), cs)))], rest],
16
- undefined,
15
+ ([as, bs = [], cs]) =>
16
+ [[html('span', { class: 'template' }, defrag(push(unshift(as, bs), cs)))]],
17
+ ([, bs], context) =>
18
+ bs && [[
19
+ html('span',
20
+ {
21
+ class: 'invalid',
22
+ ...invalid('template', 'syntax', `Missing the closing symbol "}}"`),
23
+ },
24
+ context.source.slice(context.position - context.range!, context.position))
25
+ ]],
17
26
  [3 | Backtrack.doublebracket, 3 | Backtrack.escbracket]));
18
27
 
19
28
  const bracket: TemplateParser.BracketParser = lazy(() => union([
20
29
  surround(str('('), recursion(Recursion.terminal, some(union([bracket, escsource]), ')')), str(')'), true,
21
- undefined, () => [[], ''], [3 | Backtrack.escbracket]),
30
+ undefined, () => [[]], [3 | Backtrack.escbracket]),
22
31
  surround(str('['), recursion(Recursion.terminal, some(union([bracket, escsource]), ']')), str(']'), true,
23
- undefined, () => [[], ''], [3 | Backtrack.escbracket]),
32
+ undefined, () => [[]], [3 | Backtrack.escbracket]),
24
33
  surround(str('{'), recursion(Recursion.terminal, some(union([bracket, escsource]), '}')), str('}'), true,
25
- undefined, () => [[], ''], [3 | Backtrack.escbracket]),
34
+ undefined, () => [[]], [3 | Backtrack.escbracket]),
26
35
  surround(
27
36
  str('"'),
28
37
  precedence(2, recursion(Recursion.terminal, some(escsource, '"', [['"', 2, false]]))),
29
38
  str('"'),
30
39
  true,
31
- ([as, bs = [], cs], rest, { linebreak = 0 }) =>
32
- linebreak > rest.length
33
- ? [unshift(as, bs), cs[0] + rest]
34
- : [push(unshift(as, bs), cs), rest],
35
- ([as, bs = []], rest) => [unshift(as, bs), rest],
40
+ ([as, bs = [], cs], context) =>
41
+ context.linebreak === 0
42
+ ? [push(unshift(as, bs), cs)]
43
+ : (context.position -= 1, [unshift(as, bs)]),
44
+ ([as, bs]) => bs && [unshift(as, bs)],
36
45
  [3 | Backtrack.escbracket]),
37
46
  ]));