securemark 0.291.1 → 0.293.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 (177) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/design.md +13 -2
  3. package/dist/index.js +1353 -908
  4. package/markdown.d.ts +32 -49
  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 +21 -38
  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/clear.ts +3 -4
  12. package/src/combinator/control/manipulation/convert.ts +29 -13
  13. package/src/combinator/control/manipulation/fence.ts +20 -15
  14. package/src/combinator/control/manipulation/indent.test.ts +17 -14
  15. package/src/combinator/control/manipulation/indent.ts +14 -13
  16. package/src/combinator/control/manipulation/match.ts +13 -11
  17. package/src/combinator/control/manipulation/recovery.ts +7 -3
  18. package/src/combinator/control/manipulation/scope.ts +36 -44
  19. package/src/combinator/control/manipulation/surround.ts +69 -71
  20. package/src/combinator/control/manipulation/trim.test.ts +12 -9
  21. package/src/combinator/control/monad/bind.ts +16 -16
  22. package/src/combinator/control/monad/fmap.ts +6 -6
  23. package/src/combinator/data/parser/context/delimiter.ts +10 -8
  24. package/src/combinator/data/parser/context.test.ts +19 -14
  25. package/src/combinator/data/parser/context.ts +51 -16
  26. package/src/combinator/data/parser/inits.ts +13 -14
  27. package/src/combinator/data/parser/sequence.test.ts +16 -15
  28. package/src/combinator/data/parser/sequence.ts +13 -14
  29. package/src/combinator/data/parser/some.test.ts +20 -19
  30. package/src/combinator/data/parser/some.ts +14 -17
  31. package/src/combinator/data/parser/subsequence.test.ts +22 -21
  32. package/src/combinator/data/parser/subsequence.ts +3 -3
  33. package/src/combinator/data/parser/tails.ts +3 -3
  34. package/src/combinator/data/parser/union.test.ts +16 -15
  35. package/src/combinator/data/parser/union.ts +2 -2
  36. package/src/combinator/data/parser.ts +65 -28
  37. package/src/debug.test.ts +3 -3
  38. package/src/parser/api/bind.ts +3 -3
  39. package/src/parser/api/header.ts +7 -6
  40. package/src/parser/api/normalize.ts +2 -2
  41. package/src/parser/api/parse.test.ts +26 -19
  42. package/src/parser/api/parse.ts +4 -5
  43. package/src/parser/autolink.test.ts +19 -17
  44. package/src/parser/autolink.ts +2 -4
  45. package/src/parser/block/blockquote.test.ts +86 -84
  46. package/src/parser/block/blockquote.ts +10 -8
  47. package/src/parser/block/codeblock.test.ts +58 -56
  48. package/src/parser/block/codeblock.ts +4 -4
  49. package/src/parser/block/dlist.test.ts +58 -56
  50. package/src/parser/block/dlist.ts +6 -6
  51. package/src/parser/block/extension/aside.test.ts +10 -8
  52. package/src/parser/block/extension/aside.ts +2 -2
  53. package/src/parser/block/extension/example.test.ts +20 -18
  54. package/src/parser/block/extension/example.ts +4 -4
  55. package/src/parser/block/extension/fig.test.ts +38 -36
  56. package/src/parser/block/extension/fig.ts +4 -4
  57. package/src/parser/block/extension/figbase.test.ts +17 -15
  58. package/src/parser/block/extension/figbase.ts +1 -1
  59. package/src/parser/block/extension/figure.test.ts +64 -62
  60. package/src/parser/block/extension/figure.ts +7 -6
  61. package/src/parser/block/extension/message.test.ts +15 -13
  62. package/src/parser/block/extension/message.ts +4 -4
  63. package/src/parser/block/extension/placeholder.test.ts +3 -1
  64. package/src/parser/block/extension/placeholder.ts +1 -1
  65. package/src/parser/block/extension/table.test.ts +72 -70
  66. package/src/parser/block/extension/table.ts +19 -19
  67. package/src/parser/block/extension.test.ts +3 -1
  68. package/src/parser/block/extension.ts +2 -2
  69. package/src/parser/block/heading.test.ts +65 -64
  70. package/src/parser/block/heading.ts +5 -5
  71. package/src/parser/block/ilist.test.ts +6 -4
  72. package/src/parser/block/ilist.ts +7 -7
  73. package/src/parser/block/mathblock.test.ts +33 -31
  74. package/src/parser/block/mathblock.ts +2 -2
  75. package/src/parser/block/mediablock.ts +3 -3
  76. package/src/parser/block/olist.test.ts +101 -97
  77. package/src/parser/block/olist.ts +14 -14
  78. package/src/parser/block/pagebreak.test.ts +17 -15
  79. package/src/parser/block/pagebreak.ts +2 -2
  80. package/src/parser/block/paragraph.test.ts +60 -57
  81. package/src/parser/block/paragraph.ts +2 -2
  82. package/src/parser/block/reply/cite.test.ts +41 -39
  83. package/src/parser/block/reply/cite.ts +4 -4
  84. package/src/parser/block/reply/quote.test.ts +52 -50
  85. package/src/parser/block/reply/quote.ts +5 -4
  86. package/src/parser/block/reply.test.ts +21 -19
  87. package/src/parser/block/reply.ts +3 -3
  88. package/src/parser/block/sidefence.test.ts +51 -49
  89. package/src/parser/block/sidefence.ts +3 -3
  90. package/src/parser/block/table.test.ts +51 -50
  91. package/src/parser/block/table.ts +14 -14
  92. package/src/parser/block/ulist.test.ts +53 -50
  93. package/src/parser/block/ulist.ts +8 -8
  94. package/src/parser/block.ts +53 -19
  95. package/src/parser/context.ts +1 -0
  96. package/src/parser/header.test.ts +22 -21
  97. package/src/parser/header.ts +28 -16
  98. package/src/parser/inline/annotation.test.ts +44 -42
  99. package/src/parser/inline/annotation.ts +2 -2
  100. package/src/parser/inline/autolink/account.test.ts +33 -30
  101. package/src/parser/inline/autolink/account.ts +12 -9
  102. package/src/parser/inline/autolink/anchor.test.ts +23 -21
  103. package/src/parser/inline/autolink/anchor.ts +21 -17
  104. package/src/parser/inline/autolink/channel.test.ts +16 -14
  105. package/src/parser/inline/autolink/channel.ts +40 -15
  106. package/src/parser/inline/autolink/email.test.ts +38 -36
  107. package/src/parser/inline/autolink/email.ts +7 -9
  108. package/src/parser/inline/autolink/hashnum.test.ts +34 -37
  109. package/src/parser/inline/autolink/hashnum.ts +9 -5
  110. package/src/parser/inline/autolink/hashtag.test.ts +57 -56
  111. package/src/parser/inline/autolink/hashtag.ts +10 -7
  112. package/src/parser/inline/autolink/url.test.ts +75 -75
  113. package/src/parser/inline/autolink/url.ts +24 -28
  114. package/src/parser/inline/autolink.ts +21 -24
  115. package/src/parser/inline/bracket.test.ts +69 -67
  116. package/src/parser/inline/bracket.ts +35 -35
  117. package/src/parser/inline/code.test.ts +32 -29
  118. package/src/parser/inline/code.ts +20 -13
  119. package/src/parser/inline/deletion.test.ts +29 -27
  120. package/src/parser/inline/deletion.ts +3 -3
  121. package/src/parser/inline/emphasis.test.ts +40 -36
  122. package/src/parser/inline/emphasis.ts +4 -9
  123. package/src/parser/inline/emstrong.test.ts +102 -96
  124. package/src/parser/inline/emstrong.ts +93 -45
  125. package/src/parser/inline/extension/index.test.ts +93 -89
  126. package/src/parser/inline/extension/index.ts +16 -31
  127. package/src/parser/inline/extension/indexee.ts +1 -1
  128. package/src/parser/inline/extension/indexer.test.ts +26 -24
  129. package/src/parser/inline/extension/indexer.ts +3 -3
  130. package/src/parser/inline/extension/label.test.ts +34 -32
  131. package/src/parser/inline/extension/label.ts +1 -1
  132. package/src/parser/inline/extension/placeholder.test.ts +44 -42
  133. package/src/parser/inline/extension/placeholder.ts +12 -9
  134. package/src/parser/inline/html.test.ts +108 -106
  135. package/src/parser/inline/html.ts +38 -37
  136. package/src/parser/inline/htmlentity.test.ts +39 -37
  137. package/src/parser/inline/htmlentity.ts +9 -3
  138. package/src/parser/inline/insertion.test.ts +29 -27
  139. package/src/parser/inline/insertion.ts +3 -3
  140. package/src/parser/inline/italic.test.ts +55 -53
  141. package/src/parser/inline/italic.ts +3 -3
  142. package/src/parser/inline/link.test.ts +187 -185
  143. package/src/parser/inline/link.ts +45 -27
  144. package/src/parser/inline/mark.test.ts +31 -29
  145. package/src/parser/inline/mark.ts +4 -4
  146. package/src/parser/inline/math.test.ts +133 -131
  147. package/src/parser/inline/math.ts +9 -13
  148. package/src/parser/inline/media.test.ts +93 -91
  149. package/src/parser/inline/media.ts +50 -26
  150. package/src/parser/inline/reference.test.ts +110 -108
  151. package/src/parser/inline/reference.ts +50 -41
  152. package/src/parser/inline/remark.test.ts +53 -51
  153. package/src/parser/inline/remark.ts +5 -5
  154. package/src/parser/inline/ruby.test.ts +46 -44
  155. package/src/parser/inline/ruby.ts +26 -27
  156. package/src/parser/inline/shortmedia.test.ts +11 -9
  157. package/src/parser/inline/shortmedia.ts +6 -9
  158. package/src/parser/inline/strong.test.ts +37 -33
  159. package/src/parser/inline/strong.ts +7 -9
  160. package/src/parser/inline/template.test.ts +24 -22
  161. package/src/parser/inline/template.ts +20 -11
  162. package/src/parser/inline.test.ts +223 -220
  163. package/src/parser/inline.ts +13 -8
  164. package/src/parser/segment.ts +13 -8
  165. package/src/parser/source/escapable.test.ts +24 -22
  166. package/src/parser/source/escapable.ts +50 -41
  167. package/src/parser/source/line.test.ts +19 -17
  168. package/src/parser/source/line.ts +28 -4
  169. package/src/parser/source/str.ts +18 -23
  170. package/src/parser/source/text.test.ts +85 -83
  171. package/src/parser/source/text.ts +78 -54
  172. package/src/parser/source/unescapable.test.ts +24 -22
  173. package/src/parser/source/unescapable.ts +42 -33
  174. package/src/parser/source.ts +1 -1
  175. package/src/parser/util.ts +39 -36
  176. package/src/parser/visibility.ts +33 -24
  177. package/src/util/quote.ts +4 -2
@@ -1,9 +1,11 @@
1
1
  import { extension } from './extension';
2
2
  import { some } from '../../combinator';
3
+ import { input } from '../../combinator/data/parser';
3
4
 
4
5
  describe('Unit: parser/block/extension', () => {
5
6
  describe('extension', () => {
6
- const parser = (source: string) => some(extension)({ source, context: {} });
7
+ const parser = (source: string) => some(extension)(input(source, ctx));
8
+ const { context: ctx } = input('', {});
7
9
 
8
10
  it('invalid', () => {
9
11
  assert(!parser(''));
@@ -9,12 +9,12 @@ import { aside } from './extension/aside';
9
9
  import { example } from './extension/example';
10
10
  import { placeholder, segment as seg_placeholder } from './extension/placeholder';
11
11
 
12
- export const segment: ExtensionParser.SegmentParser = validate(['~~~', '[$', '$'], validate(/^~{3,}|^\[?\$[A-Za-z-]\S+[^\S\n]*(?:$|\n)/, union([
12
+ export const segment: ExtensionParser.SegmentParser = validate(/~~~|\[?\$|~{3,}|\[?\$[A-Za-z-]\S+[^\S\n]*(?:$|\n)/y, union([
13
13
  seg_fig,
14
14
  seg_figure,
15
15
  seg_table,
16
16
  seg_placeholder,
17
- ])));
17
+ ]));
18
18
 
19
19
  export const extension: ExtensionParser = union([
20
20
  figbase,
@@ -1,84 +1,85 @@
1
1
  import { heading, segment } from './heading';
2
- import { eval, exec } from '../../combinator/data/parser';
2
+ import { input, eval } from '../../combinator/data/parser';
3
3
  import { some } from '../../combinator';
4
4
  import { inspect } from '../../debug.test';
5
5
 
6
6
  describe('Unit: parser/block/heading', () => {
7
7
  describe('heading', () => {
8
8
  const parser = (source: string) => {
9
- const result = segment({ source, context: {} });
9
+ const result = segment(input(source, ctx));
10
10
  return result
11
- ? [eval(result).flatMap(seg => eval<HTMLElement | string>(heading({ source: seg, context: {} }), [seg])), exec(result)] as const
12
- : some(heading)({ source, context: {} });
11
+ ? [eval(result).flatMap(seg => eval<HTMLElement | string>(heading(input(seg, {})), [seg]))] as const
12
+ : some(heading)(input(source, ctx));
13
13
  };
14
+ const { context: ctx } = input('', {});
14
15
 
15
16
  it('invalid', () => {
16
- assert.deepStrictEqual(inspect(parser('')), undefined);
17
- assert.deepStrictEqual(inspect(parser('\n')), undefined);
18
- assert.deepStrictEqual(inspect(parser('#')), undefined);
19
- assert.deepStrictEqual(inspect(parser('#\n')), undefined);
20
- assert.deepStrictEqual(inspect(parser('#a\n')), undefined);
21
- assert.deepStrictEqual(inspect(parser('#a \n')), undefined);
22
- assert.deepStrictEqual(inspect(parser('#a\n#')), undefined);
23
- assert.deepStrictEqual(inspect(parser('#a\\\n#')), undefined);
24
- assert.deepStrictEqual(inspect(parser('# ')), undefined);
25
- assert.deepStrictEqual(inspect(parser('#\n')), undefined);
26
- assert.deepStrictEqual(inspect(parser('# \n')), undefined);
27
- assert.deepStrictEqual(inspect(parser('# a\nb')), undefined);
28
- assert.deepStrictEqual(inspect(parser('# *a\nb*')), undefined);
29
- assert.deepStrictEqual(inspect(parser('# a\n#b')), undefined);
30
- assert.deepStrictEqual(inspect(parser('####### a')), [['<h6 class="invalid" id="index::a">a</h6>'], '']);
31
- assert.deepStrictEqual(inspect(parser(' # a')), undefined);
17
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
18
+ assert.deepStrictEqual(inspect(parser('\n'), ctx), undefined);
19
+ assert.deepStrictEqual(inspect(parser('#'), ctx), undefined);
20
+ assert.deepStrictEqual(inspect(parser('#\n'), ctx), undefined);
21
+ assert.deepStrictEqual(inspect(parser('#a\n'), ctx), undefined);
22
+ assert.deepStrictEqual(inspect(parser('#a \n'), ctx), undefined);
23
+ assert.deepStrictEqual(inspect(parser('#a\n#'), ctx), undefined);
24
+ assert.deepStrictEqual(inspect(parser('#a\\\n#'), ctx), undefined);
25
+ assert.deepStrictEqual(inspect(parser('# '), ctx), undefined);
26
+ assert.deepStrictEqual(inspect(parser('#\n'), ctx), undefined);
27
+ assert.deepStrictEqual(inspect(parser('# \n'), ctx), undefined);
28
+ assert.deepStrictEqual(inspect(parser('# a\nb'), ctx), undefined);
29
+ assert.deepStrictEqual(inspect(parser('# *a\nb*'), ctx), undefined);
30
+ assert.deepStrictEqual(inspect(parser('# a\n#b'), ctx), undefined);
31
+ assert.deepStrictEqual(inspect(parser('####### a'), ctx), [['<h6 class="invalid" id="index::#######_a">####### a</h6>'], '']);
32
+ assert.deepStrictEqual(inspect(parser(' # a'), ctx), undefined);
32
33
  });
33
34
 
34
35
  it('basic', () => {
35
- assert.deepStrictEqual(inspect(parser('# a')), [['<h1 id="index::a">a</h1>'], '']);
36
- assert.deepStrictEqual(inspect(parser('# a ')), [['<h1 id="index::a">a</h1>'], '']);
37
- assert.deepStrictEqual(inspect(parser('# a b c \n')), [['<h1 id="index::a_b__c">a b c</h1>'], '']);
38
- assert.deepStrictEqual(inspect(parser('# a\n')), [['<h1 id="index::a">a</h1>'], '']);
39
- assert.deepStrictEqual(inspect(parser('# *a*`b`${c}$')), [['<h1 id="index::a`b`${c}$"><em>a</em><code data-src="`b`">b</code><span class="math" translate="no" data-src="${c}$">${c}$</span></h1>'], '']);
40
- assert.deepStrictEqual(inspect(parser('# a\\')), [['<h1 id="index::a">a</h1>'], '']);
41
- assert.deepStrictEqual(inspect(parser('# a\\\n')), [['<h1 id="index::a">a</h1>'], '']);
42
- assert.deepStrictEqual(inspect(parser('# \\')), [['<h1 id="index::\\">\\</h1>'], '']);
43
- assert.deepStrictEqual(inspect(parser('# \\ a')), [['<h1 id="index::a">a</h1>'], '']);
44
- assert.deepStrictEqual(inspect(parser('## \\')), [['<h2 id="index::\\">\\</h2>'], '']);
45
- assert.deepStrictEqual(inspect(parser('# @a')), [['<h1 id="index::@a">@a</h1>'], '']);
46
- assert.deepStrictEqual(inspect(parser('## @a')), [['<h2 id="index::@a"><a class="account" href="/@a">@a</a></h2>'], '']);
47
- assert.deepStrictEqual(inspect(parser('# http://host')), [['<h1 id="index::http://host">http://host</h1>'], '']);
48
- assert.deepStrictEqual(inspect(parser('## http://host')), [['<h2 id="index::http://host"><a class="url" href="http://host" target="_blank">http://host</a></h2>'], '']);
49
- assert.deepStrictEqual(inspect(parser('# !http://host')), [['<h1 id="index::!http://host">!http://host</h1>'], '']);
50
- assert.deepStrictEqual(inspect(parser('## !http://host')), [['<h2 id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></h2>'], '']);
51
- assert.deepStrictEqual(inspect(parser('# a((b))')), [['<h1 id="index::a((b))">a<span class="paren">((b))</span></h1>'], '']);
52
- assert.deepStrictEqual(inspect(parser('## a((b))')), [['<h2 id="index::a((b))">a<span class="paren">((b))</span></h2>'], '']);
53
- assert.deepStrictEqual(inspect(parser('# a[[b]]')), [['<h1 id="index::a[[b]]">a[[b]]</h1>'], '']);
54
- assert.deepStrictEqual(inspect(parser('## a[[b]]')), [['<h2 id="index::a[[b]]">a[[b]]</h2>'], '']);
55
- assert.deepStrictEqual(inspect(parser('###### a')), [['<h6 id="index::a">a</h6>'], '']);
56
- assert.deepStrictEqual(inspect(parser('# a\n##')), [['<h1 id="index::a">a</h1>', '##'], '']);
57
- assert.deepStrictEqual(inspect(parser('# a\n## ')), [['<h1 id="index::a">a</h1>', '## '], '']);
58
- assert.deepStrictEqual(inspect(parser('# a\n## b')), [['<h1 id="index::a">a</h1>', '<h2 id="index::b">b</h2>'], '']);
59
- assert.deepStrictEqual(inspect(parser('# a\n##\n## b')), [['<h1 id="index::a">a</h1>', '##\n', '<h2 id="index::b">b</h2>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('# a'), ctx), [['<h1 id="index::a">a</h1>'], '']);
37
+ assert.deepStrictEqual(inspect(parser('# a '), ctx), [['<h1 id="index::a">a</h1>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('# a b c \n'), ctx), [['<h1 id="index::a_b_c">a b c</h1>'], '']);
39
+ assert.deepStrictEqual(inspect(parser('# a\n'), ctx), [['<h1 id="index::a">a</h1>'], '']);
40
+ assert.deepStrictEqual(inspect(parser('# *a*`b`${c}$'), ctx), [['<h1 id="index::a`b`${c}$"><em>a</em><code data-src="`b`">b</code><span class="math" translate="no" data-src="${c}$">${c}$</span></h1>'], '']);
41
+ assert.deepStrictEqual(inspect(parser('# a\\'), ctx), [['<h1 id="index::a">a</h1>'], '']);
42
+ assert.deepStrictEqual(inspect(parser('# a\\\n'), ctx), [['<h1 id="index::a">a</h1>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('# \\'), ctx), [['<h1 id="index::\\">\\</h1>'], '']);
44
+ assert.deepStrictEqual(inspect(parser('# \\ a'), ctx), [['<h1 id="index::a">a</h1>'], '']);
45
+ assert.deepStrictEqual(inspect(parser('## \\'), ctx), [['<h2 id="index::\\">\\</h2>'], '']);
46
+ assert.deepStrictEqual(inspect(parser('# @a'), ctx), [['<h1 id="index::@a">@a</h1>'], '']);
47
+ assert.deepStrictEqual(inspect(parser('## @a'), ctx), [['<h2 id="index::@a"><a class="account" href="/@a">@a</a></h2>'], '']);
48
+ assert.deepStrictEqual(inspect(parser('# http://host'), ctx), [['<h1 id="index::http://host">http://host</h1>'], '']);
49
+ assert.deepStrictEqual(inspect(parser('## http://host'), ctx), [['<h2 id="index::http://host"><a class="url" href="http://host" target="_blank">http://host</a></h2>'], '']);
50
+ assert.deepStrictEqual(inspect(parser('# !http://host'), ctx), [['<h1 id="index::!http://host">!http://host</h1>'], '']);
51
+ assert.deepStrictEqual(inspect(parser('## !http://host'), ctx), [['<h2 id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></h2>'], '']);
52
+ assert.deepStrictEqual(inspect(parser('# a((b))'), ctx), [['<h1 id="index::a((b))">a<span class="paren">((b))</span></h1>'], '']);
53
+ assert.deepStrictEqual(inspect(parser('## a((b))'), ctx), [['<h2 id="index::a((b))">a<span class="paren">((b))</span></h2>'], '']);
54
+ assert.deepStrictEqual(inspect(parser('# a[[b]]'), ctx), [['<h1 id="index::a[[b]]">a[[b]]</h1>'], '']);
55
+ assert.deepStrictEqual(inspect(parser('## a[[b]]'), ctx), [['<h2 id="index::a[[b]]">a[[b]]</h2>'], '']);
56
+ assert.deepStrictEqual(inspect(parser('###### a'), ctx), [['<h6 id="index::a">a</h6>'], '']);
57
+ assert.deepStrictEqual(inspect(parser('# a\n##'), ctx), [['<h1 id="index::a">a</h1>', '##'], '']);
58
+ assert.deepStrictEqual(inspect(parser('# a\n## '), ctx), [['<h1 id="index::a">a</h1>', '## '], '']);
59
+ assert.deepStrictEqual(inspect(parser('# a\n## b'), ctx), [['<h1 id="index::a">a</h1>', '<h2 id="index::b">b</h2>'], '']);
60
+ assert.deepStrictEqual(inspect(parser('# a\n##\n## b'), ctx), [['<h1 id="index::a">a</h1>', '##\n', '<h2 id="index::b">b</h2>'], '']);
60
61
  });
61
62
 
62
63
  it('indexer', () => {
63
- assert.deepStrictEqual(inspect(parser('# [|a]')), [['<h1 id="index::a"><span class="invalid">a</span></h1>'], '']);
64
- assert.deepStrictEqual(inspect(parser('# a[|b]')), [['<h1 id="index::ab">a<span class="invalid">b</span></h1>'], '']);
65
- assert.deepStrictEqual(inspect(parser('# a [|b]')), [['<h1 id="index::b">a<span class="indexer" data-index="b"></span></h1>'], '']);
66
- assert.deepStrictEqual(inspect(parser('# a [|b] ')), [['<h1 id="index::b">a<span class="indexer" data-index="b"></span></h1>'], '']);
67
- assert.deepStrictEqual(inspect(parser('# a [|b]\\')), [['<h1 id="index::a_b">a <span class="invalid">b</span></h1>'], '']);
68
- assert.deepStrictEqual(inspect(parser('# a [|B]')), [['<h1 id="index::B">a<span class="indexer" data-index="B"></span></h1>'], '']);
69
- assert.deepStrictEqual(inspect(parser('# a [|b ]')), [['<h1 id="index::b">a<span class="indexer" data-index="b"></span></h1>'], '']);
70
- assert.deepStrictEqual(inspect(parser('# a [|b ]')), [['<h1 id="index::b">a<span class="indexer" data-index="b"></span></h1>'], '']);
71
- assert.deepStrictEqual(inspect(parser('# a [|b c]')), [['<h1 id="index::b_c">a<span class="indexer" data-index="b_c"></span></h1>'], '']);
72
- assert.deepStrictEqual(inspect(parser('# a [|*b*`c`${d}$]')), [['<h1 id="index::*b*`c`${d}$">a<span class="indexer" data-index="*b*`c`${d}$"></span></h1>'], '']);
73
- assert.deepStrictEqual(inspect(parser('# a [|@a]')), [['<h1 id="index::@a">a<span class="indexer" data-index="@a"></span></h1>'], '']);
74
- assert.deepStrictEqual(inspect(parser('# a [|http://host]')), [['<h1 id="index::http://host">a<span class="indexer" data-index="http://host"></span></h1>'], '']);
75
- assert.deepStrictEqual(inspect(parser('# a [|!http://host]')), [['<h1 id="index::!http://host">a<span class="indexer" data-index="!http://host"></span></h1>'], '']);
76
- assert.deepStrictEqual(inspect(parser('# a [|a((b))]')), [['<h1 id="index::a((b))">a<span class="indexer" data-index="a((b))"></span></h1>'], '']);
77
- assert.deepStrictEqual(inspect(parser('# a [|a[[b]]]')), [['<h1 id="index::a[[b]]">a<span class="indexer" data-index="a[[b]]"></span></h1>'], '']);
78
- assert.deepStrictEqual(inspect(parser('# a [|b] [|c]')), [['<h1 id="index::c">a <span class="invalid">b</span><span class="indexer" data-index="c"></span></h1>'], '']);
79
- assert.deepStrictEqual(inspect(parser('# a [|b] \n')), [['<h1 id="index::b">a<span class="indexer" data-index="b"></span></h1>'], '']);
80
- assert.deepStrictEqual(inspect(parser('# a \\[|b]')), [['<h1 id="index::a_[|b]">a [|b]</h1>'], '']);
81
- assert.deepStrictEqual(inspect(parser('## a [|b] [|c]')), [['<h2 id="index::c">a <span class="invalid">b</span><span class="indexer" data-index="c"></span></h2>'], '']);
64
+ assert.deepStrictEqual(inspect(parser('# [|a]'), ctx), [['<h1 id="index::[|a]"><span class="invalid">[|a]</span></h1>'], '']);
65
+ assert.deepStrictEqual(inspect(parser('# a[|b]'), ctx), [['<h1 id="index::a[|b]">a<span class="invalid">[|b]</span></h1>'], '']);
66
+ assert.deepStrictEqual(inspect(parser('# a [|b]'), ctx), [['<h1 id="index::b">a<span class="indexer" data-index="b"></span></h1>'], '']);
67
+ assert.deepStrictEqual(inspect(parser('# a [|b] '), ctx), [['<h1 id="index::b">a<span class="indexer" data-index="b"></span></h1>'], '']);
68
+ assert.deepStrictEqual(inspect(parser('# a [|b]\\'), ctx), [['<h1 id="index::a_[|b]">a <span class="invalid">[|b]</span></h1>'], '']);
69
+ assert.deepStrictEqual(inspect(parser('# a [|B]'), ctx), [['<h1 id="index::B">a<span class="indexer" data-index="B"></span></h1>'], '']);
70
+ assert.deepStrictEqual(inspect(parser('# a [|b ]'), ctx), [['<h1 id="index::b">a<span class="indexer" data-index="b"></span></h1>'], '']);
71
+ assert.deepStrictEqual(inspect(parser('# a [|b ]'), ctx), [['<h1 id="index::b">a<span class="indexer" data-index="b"></span></h1>'], '']);
72
+ assert.deepStrictEqual(inspect(parser('# a [|b c]'), ctx), [['<h1 id="index::b_c">a<span class="indexer" data-index="b_c"></span></h1>'], '']);
73
+ assert.deepStrictEqual(inspect(parser('# a [|*b*\\`c\\`\\$\\{d\\}\\$]'), ctx), [['<h1 id="index::*b*`c`${d}$">a<span class="indexer" data-index="*b*`c`${d}$"></span></h1>'], '']);
74
+ assert.deepStrictEqual(inspect(parser('# a [|@a]'), ctx), [['<h1 id="index::@a">a<span class="indexer" data-index="@a"></span></h1>'], '']);
75
+ assert.deepStrictEqual(inspect(parser('# a [|http://host]'), ctx), [['<h1 id="index::http://host">a<span class="indexer" data-index="http://host"></span></h1>'], '']);
76
+ assert.deepStrictEqual(inspect(parser('# a [|!http://host]'), ctx), [['<h1 id="index::!http://host">a<span class="indexer" data-index="!http://host"></span></h1>'], '']);
77
+ assert.deepStrictEqual(inspect(parser('# a [|a\\(\\(b\\)\\)]'), ctx), [['<h1 id="index::a((b))">a<span class="indexer" data-index="a((b))"></span></h1>'], '']);
78
+ assert.deepStrictEqual(inspect(parser('# a [|a\\[\\[b\\]\\]]'), ctx), [['<h1 id="index::a[[b]]">a<span class="indexer" data-index="a[[b]]"></span></h1>'], '']);
79
+ assert.deepStrictEqual(inspect(parser('# a [|b] [|c]'), ctx), [['<h1 id="index::c">a <span class="invalid">[|b]</span><span class="indexer" data-index="c"></span></h1>'], '']);
80
+ assert.deepStrictEqual(inspect(parser('# a [|b] \n'), ctx), [['<h1 id="index::b">a<span class="indexer" data-index="b"></span></h1>'], '']);
81
+ assert.deepStrictEqual(inspect(parser('# a \\[|b]'), ctx), [['<h1 id="index::a_[|b]">a [|b]</h1>'], '']);
82
+ assert.deepStrictEqual(inspect(parser('## a [|b] [|c]'), ctx), [['<h2 id="index::c">a <span class="invalid">[|b]</span><span class="indexer" data-index="c"></span></h2>'], '']);
82
83
  });
83
84
 
84
85
  });
@@ -8,26 +8,26 @@ import { invalid } from '../util';
8
8
  import { html, defrag } from 'typed-dom/dom';
9
9
 
10
10
  export const segment: HeadingParser.SegmentParser = block(validate('#', focus(
11
- /^#+[^\S\n]+\S[^\n]*(?:\n#+(?!\S)[^\n]*)*(?:$|\n)/,
12
- some(line(({ source }) => [[source], ''])))));
11
+ /#+[^\S\n]+\S[^\n]*(?:\n#+(?!\S)[^\n]*)*(?:$|\n)/y,
12
+ some(line(({ context: { source } }) => [[source]])))));
13
13
 
14
14
  export const heading: HeadingParser = block(rewrite(segment,
15
15
  // その他の表示制御は各所のCSSで行う。
16
16
  state(State.annotation | State.reference | State.index | State.label | State.link,
17
17
  line(indexee(fmap(union([
18
18
  open(
19
- str(/^##+/),
19
+ str(/##+/y),
20
20
  visualize(trimBlank(some(union([indexer, inline])))), true),
21
21
  open(
22
22
  str('#'),
23
23
  state(State.linkers,
24
24
  visualize(trimBlank(some(union([indexer, inline]))))), true),
25
25
  ]),
26
- ([h, ...ns]: [string, ...(HTMLElement | string)[]]) => [
26
+ ([h, ...ns]: [string, ...(HTMLElement | string)[]], context) => [
27
27
  h.length <= 6
28
28
  ? html(`h${h.length as 1}`, { 'data-index': dataindex(ns) }, defrag(ns))
29
29
  : html(`h6`, {
30
30
  class: 'invalid',
31
31
  ...invalid('heading', 'syntax', 'Heading level must be up to 6'),
32
- }, defrag(ns))
32
+ }, context.source.slice(context.position - context.range!, context.position))
33
33
  ]))))));
@@ -1,9 +1,11 @@
1
1
  import { ilist } from './ilist';
2
2
  import { some } from '../../combinator';
3
+ import { input } from '../../combinator/data/parser';
3
4
 
4
5
  describe('Unit: parser/block/ilist', () => {
5
6
  describe('ilist', () => {
6
- const parser = (source: string) => some(ilist)({ source, context: {} });
7
+ const parser = (source: string) => some(ilist)(input(source, ctx));
8
+ const { context: ctx } = input('', {});
7
9
 
8
10
  it('single', () => {
9
11
  assert(!parser('-'));
@@ -13,9 +15,9 @@ describe('Unit: parser/block/ilist', () => {
13
15
  assert(parser('- '));
14
16
  assert(parser('+ '));
15
17
  assert(parser('* '));
16
- assert(parser('-\n-'));
17
- assert(parser('+\n+'));
18
- assert(parser('*\n*'));
18
+ assert(parser('- \n-'));
19
+ assert(parser('+ \n+'));
20
+ assert(parser('* \n*'));
19
21
  });
20
22
 
21
23
  });
@@ -7,19 +7,19 @@ import { olist_ } from './olist';
7
7
  import { inline } from '../inline';
8
8
  import { contentline } from '../source';
9
9
  import { visualize, trimBlank } from '../visibility';
10
- import { lineable, invalid } from '../util';
10
+ import { linearize, invalid } from '../util';
11
11
  import { html, defrag } from 'typed-dom/dom';
12
12
 
13
13
  export const ilist: IListParser = lazy(() => block(validate(
14
- /^[-+*](?=[^\S\n]|\n[^\S\n]*\S)/,
14
+ /[-+*] /y,
15
15
  ilist_)));
16
16
 
17
17
  export const ilist_: IListParser = lazy(() => block(fmap(validate(
18
- /^[-+*](?:$|\s)/,
18
+ /[-+*](?:$|[ \n])/y,
19
19
  some(recursion(Recursion.listitem, union([
20
20
  fmap(fallback(
21
21
  inits([
22
- line(open(/^[-+*](?:$|\s)/, trim(visualize(trimBlank(lineable(some(inline))))), true)),
22
+ line(open(/[-+*](?:$|[ \n])/y, trim(visualize(trimBlank(linearize(some(inline), -1)))), true)),
23
23
  indent(union([ulist_, olist_, ilist_])),
24
24
  ]),
25
25
  ilistitem),
@@ -33,11 +33,11 @@ export const ilist_: IListParser = lazy(() => block(fmap(validate(
33
33
  ])));
34
34
 
35
35
  export const ilistitem = rewrite(
36
- inits([contentline, indent<Parser<string>>(({ source }) => [[source], ''])]),
37
- ({ source }) => [[
36
+ inits([contentline, indent<Parser<string>>(({ context: { source } }) => [[source]])]),
37
+ ({ context: { source } }) => [[
38
38
  '',
39
39
  html('span', {
40
40
  class: 'invalid',
41
41
  ...invalid('list', 'syntax', 'Fix the indent or the head of the list item'),
42
42
  }, source.replace('\n', ''))
43
- ], '']);
43
+ ]]);
@@ -1,45 +1,47 @@
1
1
  import { mathblock } from './mathblock';
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/block/mathblock', () => {
6
7
  describe('mathblock', () => {
7
- const parser = (source: string) => some(mathblock)({ source, context: {} });
8
+ const parser = (source: string) => some(mathblock)(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('\n')), undefined);
12
- assert.deepStrictEqual(inspect(parser('$$')), undefined);
13
- assert.deepStrictEqual(inspect(parser('$$\n')), undefined);
14
- assert.deepStrictEqual(inspect(parser('$$\na')), [['<pre class="invalid" translate="no">$$\na</pre>'], '']);
15
- assert.deepStrictEqual(inspect(parser('$$\na$$')), [['<pre class="invalid" translate="no">$$\na$$</pre>'], '']);
16
- assert.deepStrictEqual(inspect(parser('$$\na\n$$b')), [['<pre class="invalid" translate="no">$$\na\n$$b</pre>'], '']);
17
- assert.deepStrictEqual(inspect(parser('$$\na\n$$\nb')), [['<pre class="invalid" translate="no">$$\na\n$$\nb</pre>'], '']);
18
- assert.deepStrictEqual(inspect(parser('$$$\n\n\n$$$')), undefined);
19
- assert.deepStrictEqual(inspect(parser('$$ $$\n$$')), undefined);
20
- assert.deepStrictEqual(inspect(parser('$$lang\n$$')), [['<pre class="invalid" translate="no">$$lang\n$$</pre>'], '']);
21
- assert.deepStrictEqual(inspect(parser('$$ param\n$$')), [['<pre class="invalid" translate="no">$$ param\n$$</pre>'], '']);
22
- assert.deepStrictEqual(inspect(parser('$$\n$$\n$$')), [['<pre class="invalid" translate="no">$$\n$$\n$$</pre>'], '']);
23
- assert.deepStrictEqual(inspect(parser('$$\n$$$')), [['<pre class="invalid" translate="no">$$\n$$$</pre>'], '']);
24
- assert.deepStrictEqual(inspect(parser('$$$\n$$')), [['<pre class="invalid" translate="no">$$$\n$$</pre>'], '']);
25
- assert.deepStrictEqual(inspect(parser('$$$\n$$$')), [['<pre class="invalid" translate="no">$$$\n$$$</pre>'], '']);
26
- assert.deepStrictEqual(inspect(parser(' $$\n$$')), undefined);
27
- assert.deepStrictEqual(inspect(parser(`$$\n0${'\n'.repeat(301)}$$`), '>'), [['<pre class="invalid" translate="no">'], '']);
12
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
+ assert.deepStrictEqual(inspect(parser('\n'), ctx), undefined);
14
+ assert.deepStrictEqual(inspect(parser('$$'), ctx), undefined);
15
+ assert.deepStrictEqual(inspect(parser('$$\n'), ctx), undefined);
16
+ assert.deepStrictEqual(inspect(parser('$$\na'), ctx), [['<pre class="invalid" translate="no">$$\na</pre>'], '']);
17
+ assert.deepStrictEqual(inspect(parser('$$\na$$'), ctx), [['<pre class="invalid" translate="no">$$\na$$</pre>'], '']);
18
+ assert.deepStrictEqual(inspect(parser('$$\na\n$$b'), ctx), [['<pre class="invalid" translate="no">$$\na\n$$b</pre>'], '']);
19
+ assert.deepStrictEqual(inspect(parser('$$\na\n$$\nb'), ctx), [['<pre class="invalid" translate="no">$$\na\n$$\nb</pre>'], '']);
20
+ assert.deepStrictEqual(inspect(parser('$$$\n\n\n$$$'), ctx), undefined);
21
+ assert.deepStrictEqual(inspect(parser('$$ $$\n$$'), ctx), undefined);
22
+ assert.deepStrictEqual(inspect(parser('$$lang\n$$'), ctx), [['<pre class="invalid" translate="no">$$lang\n$$</pre>'], '']);
23
+ assert.deepStrictEqual(inspect(parser('$$ param\n$$'), ctx), [['<pre class="invalid" translate="no">$$ param\n$$</pre>'], '']);
24
+ assert.deepStrictEqual(inspect(parser('$$\n$$\n$$'), ctx), [['<pre class="invalid" translate="no">$$\n$$\n$$</pre>'], '']);
25
+ assert.deepStrictEqual(inspect(parser('$$\n$$$'), ctx), [['<pre class="invalid" translate="no">$$\n$$$</pre>'], '']);
26
+ assert.deepStrictEqual(inspect(parser('$$$\n$$'), ctx), [['<pre class="invalid" translate="no">$$$\n$$</pre>'], '']);
27
+ assert.deepStrictEqual(inspect(parser('$$$\n$$$'), ctx), [['<pre class="invalid" translate="no">$$$\n$$$</pre>'], '']);
28
+ assert.deepStrictEqual(inspect(parser(' $$\n$$'), ctx), undefined);
29
+ assert.deepStrictEqual(inspect(parser(`$$\n0${'\n'.repeat(301)}$$`), ctx, '>'), [['<pre class="invalid" translate="no">'], '']);
28
30
  });
29
31
 
30
32
  it('basic', () => {
31
- assert.deepStrictEqual(inspect(parser('$$\n$$')), [['<div class="math" translate="no">$$\n$$</div>'], '']);
32
- assert.deepStrictEqual(inspect(parser('$$\n\n$$')), [['<div class="math" translate="no">$$\n\n$$</div>'], '']);
33
- assert.deepStrictEqual(inspect(parser('$$\na\n$$')), [['<div class="math" translate="no">$$\na\n$$</div>'], '']);
34
- assert.deepStrictEqual(inspect(parser('$$\na\n$$\n')), [['<div class="math" translate="no">$$\na\n$$</div>'], '']);
35
- assert.deepStrictEqual(inspect(parser('$$\na\nb\n$$')), [['<div class="math" translate="no">$$\na\nb\n$$</div>'], '']);
36
- assert.deepStrictEqual(inspect(parser('$$\n\\\n$$')), [['<div class="math" translate="no">$$\n\\\n$$</div>'], '']);
37
- assert.deepStrictEqual(inspect(parser('$$\n$\n$$')), [['<div class="math" translate="no">$$\n$\n$$</div>'], '']);
38
- assert.deepStrictEqual(inspect(parser('$$\n$\n\n$$')), [['<div class="math" translate="no">$$\n$\n\n$$</div>'], '']);
39
- assert.deepStrictEqual(inspect(parser('$$\n$$\n\n$$')), [['<div class="math" translate="no">$$\n$$</div>'], '\n$$']);
40
- assert.deepStrictEqual(inspect(parser('$$\n$$$\n$$')), [['<div class="math" translate="no">$$\n$$$\n$$</div>'], '']);
41
- assert.deepStrictEqual(inspect(parser('$$\n$$$\n\n$$')), [['<div class="math" translate="no">$$\n$$$\n\n$$</div>'], '']);
42
- assert.deepStrictEqual(inspect(parser(`$$\n0${'\n'.repeat(300)}$$`), '>'), [['<div class="math" translate="no">'], '']);
33
+ assert.deepStrictEqual(inspect(parser('$$\n$$'), ctx), [['<div class="math" translate="no">$$\n$$</div>'], '']);
34
+ assert.deepStrictEqual(inspect(parser('$$\n\n$$'), ctx), [['<div class="math" translate="no">$$\n\n$$</div>'], '']);
35
+ assert.deepStrictEqual(inspect(parser('$$\na\n$$'), ctx), [['<div class="math" translate="no">$$\na\n$$</div>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('$$\na\n$$\n'), ctx), [['<div class="math" translate="no">$$\na\n$$</div>'], '']);
37
+ assert.deepStrictEqual(inspect(parser('$$\na\nb\n$$'), ctx), [['<div class="math" translate="no">$$\na\nb\n$$</div>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('$$\n\\\n$$'), ctx), [['<div class="math" translate="no">$$\n\\\n$$</div>'], '']);
39
+ assert.deepStrictEqual(inspect(parser('$$\n$\n$$'), ctx), [['<div class="math" translate="no">$$\n$\n$$</div>'], '']);
40
+ assert.deepStrictEqual(inspect(parser('$$\n$\n\n$$'), ctx), [['<div class="math" translate="no">$$\n$\n\n$$</div>'], '']);
41
+ assert.deepStrictEqual(inspect(parser('$$\n$$\n\n$$'), ctx), [['<div class="math" translate="no">$$\n$$</div>'], '\n$$']);
42
+ assert.deepStrictEqual(inspect(parser('$$\n$$$\n$$'), ctx), [['<div class="math" translate="no">$$\n$$$\n$$</div>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('$$\n$$$\n\n$$'), ctx), [['<div class="math" translate="no">$$\n$$$\n\n$$</div>'], '']);
44
+ assert.deepStrictEqual(inspect(parser(`$$\n0${'\n'.repeat(300)}$$`), ctx, '>'), [['<div class="math" translate="no">'], '']);
43
45
  });
44
46
 
45
47
  });
@@ -3,7 +3,7 @@ import { block, validate, fence, clear, fmap } from '../../combinator';
3
3
  import { invalid } from '../util';
4
4
  import { html } from 'typed-dom/dom';
5
5
 
6
- const opener = /^(\${2,})(?!\$)([^\n]*)(?:$|\n)/;
6
+ const opener = /(\${2,})(?!\$)([^\n]*)(?:$|\n)/y;
7
7
 
8
8
  export const segment: MathBlockParser.SegmentParser = block(validate('$$',
9
9
  clear(fence(opener, 300))));
@@ -14,7 +14,7 @@ export const segment_: MathBlockParser.SegmentParser = block(validate('$$',
14
14
  export const mathblock: MathBlockParser = block(validate('$$', fmap(
15
15
  fence(opener, 300),
16
16
  // Bug: Type mismatch between outer and inner.
17
- ([body, overflow, closer, opener, delim, param]: string[], _, { caches: { math: cache = undefined } = {} }) => [
17
+ ([body, overflow, closer, opener, delim, param]: string[], { caches: { math: cache = undefined } = {} }) => [
18
18
  delim.length === 2 && closer && !overflow && param.trimStart() === ''
19
19
  ? cache?.get(`${delim}\n${body}${delim}`)?.cloneNode(true) as HTMLDivElement ||
20
20
  html('div', { class: 'math', translate: 'no' }, `${delim}\n${body}${delim}`)
@@ -4,7 +4,7 @@ import { medialink, media, shortmedia } from '../inline';
4
4
  import { invalid } from '../util';
5
5
  import { html } from 'typed-dom/dom';
6
6
 
7
- export const mediablock: MediaBlockParser = block(validate(['[!', '!'], fmap(
7
+ export const mediablock: MediaBlockParser = block(validate(/\[?!/y, fmap(
8
8
  inits([
9
9
  line(union([
10
10
  medialink,
@@ -15,9 +15,9 @@ export const mediablock: MediaBlockParser = block(validate(['[!', '!'], fmap(
15
15
  medialink,
16
16
  media,
17
17
  shortmedia,
18
- ]), ({ source }) => [[html('span', {
18
+ ]), ({ context: { source } }) => [[html('span', {
19
19
  class: 'invalid',
20
20
  ...invalid('mediablock', 'syntax', 'Not media syntax'),
21
- }, source.replace('\n', ''))], '']))),
21
+ }, source.replace('\n', ''))]]))),
22
22
  ]),
23
23
  ns => [html('div', ns)])));