securemark 0.291.1 → 0.292.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (164) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/design.md +13 -2
  3. package/dist/index.js +1093 -756
  4. package/markdown.d.ts +17 -17
  5. package/package.json +1 -1
  6. package/src/combinator/control/constraint/block.test.ts +8 -5
  7. package/src/combinator/control/constraint/block.ts +9 -9
  8. package/src/combinator/control/constraint/contract.ts +20 -28
  9. package/src/combinator/control/constraint/line.test.ts +9 -6
  10. package/src/combinator/control/constraint/line.ts +21 -22
  11. package/src/combinator/control/manipulation/convert.ts +29 -13
  12. package/src/combinator/control/manipulation/fence.ts +18 -15
  13. package/src/combinator/control/manipulation/indent.test.ts +17 -14
  14. package/src/combinator/control/manipulation/indent.ts +15 -8
  15. package/src/combinator/control/manipulation/match.ts +11 -10
  16. package/src/combinator/control/manipulation/recovery.ts +6 -2
  17. package/src/combinator/control/manipulation/scope.ts +37 -38
  18. package/src/combinator/control/manipulation/surround.ts +78 -60
  19. package/src/combinator/control/manipulation/trim.test.ts +12 -9
  20. package/src/combinator/control/monad/bind.ts +16 -16
  21. package/src/combinator/control/monad/fmap.ts +6 -6
  22. package/src/combinator/data/parser/context/delimiter.ts +8 -7
  23. package/src/combinator/data/parser/context.test.ts +19 -14
  24. package/src/combinator/data/parser/context.ts +20 -16
  25. package/src/combinator/data/parser/inits.ts +13 -14
  26. package/src/combinator/data/parser/sequence.test.ts +16 -15
  27. package/src/combinator/data/parser/sequence.ts +13 -14
  28. package/src/combinator/data/parser/some.test.ts +19 -18
  29. package/src/combinator/data/parser/some.ts +13 -15
  30. package/src/combinator/data/parser/subsequence.test.ts +22 -21
  31. package/src/combinator/data/parser/subsequence.ts +3 -3
  32. package/src/combinator/data/parser/tails.ts +3 -3
  33. package/src/combinator/data/parser/union.test.ts +16 -15
  34. package/src/combinator/data/parser/union.ts +2 -2
  35. package/src/combinator/data/parser.ts +66 -28
  36. package/src/debug.test.ts +3 -3
  37. package/src/parser/api/bind.ts +3 -3
  38. package/src/parser/api/header.ts +7 -6
  39. package/src/parser/api/normalize.ts +2 -2
  40. package/src/parser/api/parse.test.ts +14 -15
  41. package/src/parser/api/parse.ts +3 -3
  42. package/src/parser/autolink.test.ts +19 -17
  43. package/src/parser/block/blockquote.test.ts +86 -84
  44. package/src/parser/block/blockquote.ts +4 -2
  45. package/src/parser/block/codeblock.test.ts +58 -56
  46. package/src/parser/block/codeblock.ts +3 -3
  47. package/src/parser/block/dlist.test.ts +58 -56
  48. package/src/parser/block/extension/aside.test.ts +10 -8
  49. package/src/parser/block/extension/aside.ts +1 -1
  50. package/src/parser/block/extension/example.test.ts +20 -18
  51. package/src/parser/block/extension/example.ts +3 -3
  52. package/src/parser/block/extension/fig.test.ts +38 -36
  53. package/src/parser/block/extension/fig.ts +1 -1
  54. package/src/parser/block/extension/figbase.test.ts +17 -15
  55. package/src/parser/block/extension/figure.test.ts +64 -62
  56. package/src/parser/block/extension/figure.ts +3 -2
  57. package/src/parser/block/extension/message.test.ts +15 -13
  58. package/src/parser/block/extension/message.ts +3 -3
  59. package/src/parser/block/extension/placeholder.test.ts +3 -1
  60. package/src/parser/block/extension/table.test.ts +73 -71
  61. package/src/parser/block/extension/table.ts +5 -5
  62. package/src/parser/block/extension.test.ts +3 -1
  63. package/src/parser/block/heading.test.ts +65 -64
  64. package/src/parser/block/heading.ts +3 -3
  65. package/src/parser/block/ilist.test.ts +3 -1
  66. package/src/parser/block/ilist.ts +3 -3
  67. package/src/parser/block/mathblock.test.ts +33 -31
  68. package/src/parser/block/mathblock.ts +1 -1
  69. package/src/parser/block/mediablock.ts +2 -2
  70. package/src/parser/block/olist.test.ts +99 -97
  71. package/src/parser/block/olist.ts +2 -2
  72. package/src/parser/block/pagebreak.test.ts +17 -15
  73. package/src/parser/block/pagebreak.ts +1 -1
  74. package/src/parser/block/paragraph.test.ts +60 -57
  75. package/src/parser/block/reply/cite.test.ts +41 -39
  76. package/src/parser/block/reply/cite.ts +3 -3
  77. package/src/parser/block/reply/quote.test.ts +52 -50
  78. package/src/parser/block/reply.test.ts +21 -19
  79. package/src/parser/block/sidefence.test.ts +51 -49
  80. package/src/parser/block/table.test.ts +51 -50
  81. package/src/parser/block/table.ts +6 -6
  82. package/src/parser/block/ulist.test.ts +52 -50
  83. package/src/parser/block/ulist.ts +2 -2
  84. package/src/parser/block.ts +6 -5
  85. package/src/parser/context.ts +1 -0
  86. package/src/parser/header.test.ts +22 -21
  87. package/src/parser/header.ts +25 -13
  88. package/src/parser/inline/annotation.test.ts +44 -42
  89. package/src/parser/inline/annotation.ts +2 -2
  90. package/src/parser/inline/autolink/account.test.ts +32 -30
  91. package/src/parser/inline/autolink/account.ts +1 -1
  92. package/src/parser/inline/autolink/anchor.test.ts +23 -21
  93. package/src/parser/inline/autolink/anchor.ts +1 -1
  94. package/src/parser/inline/autolink/channel.test.ts +16 -14
  95. package/src/parser/inline/autolink/channel.ts +2 -2
  96. package/src/parser/inline/autolink/email.test.ts +38 -36
  97. package/src/parser/inline/autolink/email.ts +2 -2
  98. package/src/parser/inline/autolink/hashnum.test.ts +39 -37
  99. package/src/parser/inline/autolink/hashnum.ts +1 -1
  100. package/src/parser/inline/autolink/hashtag.test.ts +58 -56
  101. package/src/parser/inline/autolink/hashtag.ts +1 -1
  102. package/src/parser/inline/autolink/url.test.ts +76 -74
  103. package/src/parser/inline/autolink/url.ts +6 -6
  104. package/src/parser/inline/bracket.test.ts +69 -67
  105. package/src/parser/inline/bracket.ts +32 -32
  106. package/src/parser/inline/code.test.ts +32 -29
  107. package/src/parser/inline/code.ts +20 -13
  108. package/src/parser/inline/deletion.test.ts +29 -27
  109. package/src/parser/inline/deletion.ts +2 -2
  110. package/src/parser/inline/emphasis.test.ts +40 -36
  111. package/src/parser/inline/emphasis.ts +2 -2
  112. package/src/parser/inline/emstrong.test.ts +102 -96
  113. package/src/parser/inline/emstrong.ts +96 -36
  114. package/src/parser/inline/extension/index.test.ts +91 -89
  115. package/src/parser/inline/extension/index.ts +18 -30
  116. package/src/parser/inline/extension/indexee.ts +1 -1
  117. package/src/parser/inline/extension/indexer.test.ts +26 -24
  118. package/src/parser/inline/extension/indexer.ts +1 -1
  119. package/src/parser/inline/extension/label.test.ts +34 -32
  120. package/src/parser/inline/extension/placeholder.test.ts +44 -42
  121. package/src/parser/inline/extension/placeholder.ts +11 -8
  122. package/src/parser/inline/html.test.ts +108 -106
  123. package/src/parser/inline/html.ts +24 -23
  124. package/src/parser/inline/htmlentity.test.ts +39 -37
  125. package/src/parser/inline/htmlentity.ts +9 -3
  126. package/src/parser/inline/insertion.test.ts +29 -27
  127. package/src/parser/inline/insertion.ts +2 -2
  128. package/src/parser/inline/italic.test.ts +55 -53
  129. package/src/parser/inline/italic.ts +2 -2
  130. package/src/parser/inline/link.test.ts +187 -185
  131. package/src/parser/inline/link.ts +30 -12
  132. package/src/parser/inline/mark.test.ts +31 -29
  133. package/src/parser/inline/mark.ts +3 -3
  134. package/src/parser/inline/math.test.ts +133 -131
  135. package/src/parser/inline/math.ts +2 -2
  136. package/src/parser/inline/media.test.ts +93 -91
  137. package/src/parser/inline/media.ts +41 -17
  138. package/src/parser/inline/reference.test.ts +110 -108
  139. package/src/parser/inline/reference.ts +48 -39
  140. package/src/parser/inline/remark.test.ts +53 -51
  141. package/src/parser/inline/remark.ts +3 -3
  142. package/src/parser/inline/ruby.test.ts +46 -44
  143. package/src/parser/inline/ruby.ts +24 -27
  144. package/src/parser/inline/shortmedia.test.ts +11 -9
  145. package/src/parser/inline/strong.test.ts +37 -33
  146. package/src/parser/inline/strong.ts +6 -3
  147. package/src/parser/inline/template.test.ts +24 -22
  148. package/src/parser/inline/template.ts +20 -11
  149. package/src/parser/inline.test.ts +221 -220
  150. package/src/parser/inline.ts +13 -8
  151. package/src/parser/segment.ts +13 -8
  152. package/src/parser/source/escapable.test.ts +24 -22
  153. package/src/parser/source/escapable.ts +26 -41
  154. package/src/parser/source/line.test.ts +19 -17
  155. package/src/parser/source/line.ts +3 -3
  156. package/src/parser/source/str.ts +28 -11
  157. package/src/parser/source/text.test.ts +85 -83
  158. package/src/parser/source/text.ts +26 -54
  159. package/src/parser/source/unescapable.test.ts +24 -22
  160. package/src/parser/source/unescapable.ts +18 -33
  161. package/src/parser/source.ts +1 -1
  162. package/src/parser/util.ts +36 -33
  163. package/src/parser/visibility.ts +19 -15
  164. package/src/util/quote.ts +4 -2
@@ -17,54 +17,54 @@ export const bracket: BracketParser = lazy(() => union([
17
17
  precedence(1, recursion(Recursion.bracket, some(inline, ')', [[')', 1]]))),
18
18
  str(')'),
19
19
  true,
20
- ([as, bs = [], cs], rest, { recent = [] }) => [
21
- indexA.test(recent[1])
22
- ? recent
23
- : [html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))],
24
- rest
25
- ],
26
- ([as, bs = []], rest) => [unshift(as, bs), rest],
20
+ ([as, bs = [], cs], { source, position, range = 0 }) => {
21
+ const str = source.slice(position - range + 1, position - 1);
22
+ return indexA.test(str)
23
+ ? [[as[0], str, cs[0]]]
24
+ : [[html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))]];
25
+ },
26
+ ([as, bs = []]) => [unshift(as, bs)],
27
27
  [2 | Backtrack.bracket]),
28
28
  surround(
29
29
  str('('),
30
30
  precedence(1, recursion(Recursion.bracket, some(inline, ')', [[')', 1]]))),
31
31
  str(')'),
32
32
  true,
33
- ([as, bs = [], cs], rest, { recent = [] }) => [
34
- indexF.test(recent[1])
35
- ? recent
36
- : [html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))],
37
- rest
38
- ],
39
- ([as, bs = []], rest) => [unshift(as, bs), rest]),
33
+ ([as, bs = [], cs], { source, position, range = 0 }) => {
34
+ const str = source.slice(position - range + 1, position - 1);
35
+ return indexF.test(str)
36
+ ? [[as[0], str, cs[0]]]
37
+ : [[html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))]];
38
+ },
39
+ ([as, bs = []]) => [unshift(as, bs)]),
40
40
  surround(
41
41
  str('['),
42
42
  precedence(1, recursion(Recursion.bracket, some(inline, ']', [[']', 1]]))),
43
43
  str(']'),
44
44
  true,
45
- ([as, bs = [], cs], rest, context) => {
45
+ ([as, bs = [], cs], context) => {
46
46
  if (context.state! & State.link) {
47
- const { recent } = context;
48
- const head = recent!.reduce((a, b) => a + b.length, rest.length);
49
- if (context.linebreak! > 0 || rest[0] !== '{') {
47
+ const { source, position, range = 0 } = context;
48
+ const head = position - range;
49
+ if (context.linebreak !== 0 || source[position] !== '{') {
50
50
  setBacktrack(context, [2 | Backtrack.link], head);
51
51
  }
52
52
  else {
53
53
  context.state! ^= State.link;
54
- assert(rest.length > 0);
55
- const result = !isBacktrack(context, [1 | Backtrack.link], rest)
56
- ? textlink({ source: rest, context })
54
+ const result = !isBacktrack(context, [1 | Backtrack.link])
55
+ ? textlink({ context })
57
56
  : undefined;
57
+ context.position = position;
58
58
  if (!result) {
59
59
  setBacktrack(context, [2 | Backtrack.link], head);
60
60
  }
61
61
  context.state! ^= State.link;
62
- context.recent = recent;
62
+ context.range = range;
63
63
  }
64
64
  }
65
- return [push(unshift(as, bs), cs), rest];
65
+ return [push(unshift(as, bs), cs)];
66
66
  },
67
- ([as, bs = []], rest) => [unshift(as, bs), rest],
67
+ ([as, bs = []]) => [unshift(as, bs)],
68
68
  [2 | Backtrack.bracket]),
69
69
  surround(
70
70
  str('['),
@@ -72,14 +72,14 @@ export const bracket: BracketParser = lazy(() => union([
72
72
  str(']'),
73
73
  true,
74
74
  undefined,
75
- ([as, bs = []], rest) => [unshift(as, bs), rest]),
75
+ ([as, bs = []]) => [unshift(as, bs)]),
76
76
  surround(
77
77
  str('{'),
78
78
  precedence(1, recursion(Recursion.bracket, some(inline, '}', [['}', 1]]))),
79
79
  str('}'),
80
80
  true,
81
81
  undefined,
82
- ([as, bs = []], rest) => [unshift(as, bs), rest],
82
+ ([as, bs = []]) => [unshift(as, bs)],
83
83
  [2 | Backtrack.bracket]),
84
84
  surround(
85
85
  str('{'),
@@ -87,17 +87,17 @@ export const bracket: BracketParser = lazy(() => union([
87
87
  str('}'),
88
88
  true,
89
89
  undefined,
90
- ([as, bs = []], rest) => [unshift(as, bs), rest]),
90
+ ([as, bs = []]) => [unshift(as, bs)]),
91
91
  // 同一行内でしか閉じない以外括弧と同じ挙動
92
92
  surround(
93
93
  str('"'),
94
94
  precedence(2, recursion(Recursion.bracket, some(inline, '"', [['"', 2, false]]))),
95
95
  str('"'),
96
96
  true,
97
- ([as, bs = [], cs], rest, { linebreak = 0 }) =>
98
- linebreak > rest.length
99
- ? [unshift(as, bs), cs[0] + rest]
100
- : [push(unshift(as, bs), cs), rest],
101
- ([as, bs = []], rest) => [unshift(as, bs), rest],
97
+ ([as, bs = [], cs], context) =>
98
+ context.linebreak === 0
99
+ ? [push(unshift(as, bs), cs)]
100
+ : (context.position -= 1, [unshift(as, bs)]),
101
+ ([as, bs = []]) => [unshift(as, bs)],
102
102
  [2 | Backtrack.bracket]),
103
103
  ]));
@@ -1,52 +1,55 @@
1
1
  import { code } from './code';
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/code', () => {
6
7
  describe('code', () => {
7
- const parser = (source: string) => some(code)({ source, context: {} });
8
+ const parser = (source: string) => some(code)(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('``a`')), undefined);
14
- assert.deepStrictEqual(inspect(parser('`a``')), undefined);
15
- assert.deepStrictEqual(inspect(parser('`\n`')), undefined);
16
- assert.deepStrictEqual(inspect(parser('`a\nb`')), undefined);
17
- assert.deepStrictEqual(inspect(parser('`a\\\nb`')), undefined);
18
- assert.deepStrictEqual(inspect(parser(' ` `')), undefined);
12
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
+ assert.deepStrictEqual(inspect(parser('`'), ctx), [['`'], '']);
14
+ assert.deepStrictEqual(inspect(parser('``'), ctx), [['``'], '']);
15
+ assert.deepStrictEqual(inspect(parser('``a`'), ctx), [['<code class="invalid">``a`</code>'], '']);
16
+ assert.deepStrictEqual(inspect(parser('`a``'), ctx), [ [ '<code class="invalid">`a``</code>' ], '' ]);
17
+ assert.deepStrictEqual(inspect(parser('`\n`'), ctx), [['`'], '\n`']);
18
+ assert.deepStrictEqual(inspect(parser('`a\nb`'), ctx), [['<code class="invalid">`a</code>'], '\nb`']);
19
+ assert.deepStrictEqual(inspect(parser('`a\\\nb`'), ctx), [['<code class="invalid">`a\\</code>'], '\nb`']);
20
+ assert.deepStrictEqual(inspect(parser(' ` `'), ctx), undefined);
19
21
  });
20
22
 
21
23
  it('basic', () => {
22
- assert.deepStrictEqual(inspect(parser('` `')), [['<code data-src="` `"> </code>'], '']);
23
- assert.deepStrictEqual(inspect(parser('` `')), [['<code data-src="` `"> </code>'], '']);
24
- assert.deepStrictEqual(inspect(parser('` `')), [['<code data-src="` `"> </code>'], '']);
25
- assert.deepStrictEqual(inspect(parser('`a`')), [['<code data-src="`a`">a</code>'], '']);
26
- assert.deepStrictEqual(inspect(parser('`ab`')), [['<code data-src="`ab`">ab</code>'], '']);
27
- assert.deepStrictEqual(inspect(parser('`a`b')), [['<code data-src="`a`">a</code>'], 'b']);
28
- assert.deepStrictEqual(inspect(parser('`a`b`')), [['<code data-src="`a`">a</code>'], 'b`']);
24
+ assert.deepStrictEqual(inspect(parser('` `'), ctx), [['<code data-src="` `"> </code>'], '']);
25
+ assert.deepStrictEqual(inspect(parser('` `'), ctx), [['<code data-src="` `"> </code>'], '']);
26
+ assert.deepStrictEqual(inspect(parser('` `'), ctx), [['<code data-src="` `"> </code>'], '']);
27
+ assert.deepStrictEqual(inspect(parser('`a`'), ctx), [['<code data-src="`a`">a</code>'], '']);
28
+ assert.deepStrictEqual(inspect(parser('`ab`'), ctx), [['<code data-src="`ab`">ab</code>'], '']);
29
+ assert.deepStrictEqual(inspect(parser('`a`b'), ctx), [['<code data-src="`a`">a</code>'], 'b']);
30
+ assert.deepStrictEqual(inspect(parser('`a`b`'), ctx), [['<code data-src="`a`">a</code>'], 'b`']);
31
+ assert.deepStrictEqual(inspect(parser('`a`\n'), ctx), [['<code data-src="`a`">a</code>'], '\n']);
29
32
  });
30
33
 
31
34
  it('escape', () => {
32
- assert.deepStrictEqual(inspect(parser('`\\`')), [['<code data-src="`\\`">\\</code>'], '']);
33
- assert.deepStrictEqual(inspect(parser('`\\\\`')), [['<code data-src="`\\\\`">\\\\</code>'], '']);
34
- assert.deepStrictEqual(inspect(parser('`&nbsp;`')), [['<code data-src="`&amp;nbsp;`">&amp;nbsp;</code>'], '']);
35
- assert.deepStrictEqual(inspect(parser('` `` `')), [['<code data-src="` `` `">``</code>'], '']);
36
- assert.deepStrictEqual(inspect(parser('`` ` ``')), [['<code data-src="`` ` ``">`</code>'], '']);
35
+ assert.deepStrictEqual(inspect(parser('`\\`'), ctx), [['<code data-src="`\\`">\\</code>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('`\\\\`'), ctx), [['<code data-src="`\\\\`">\\\\</code>'], '']);
37
+ assert.deepStrictEqual(inspect(parser('`&nbsp;`'), ctx), [['<code data-src="`&amp;nbsp;`">&amp;nbsp;</code>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('` `` `'), ctx), [['<code data-src="` `` `">``</code>'], '']);
39
+ assert.deepStrictEqual(inspect(parser('`` ` ``'), ctx), [['<code data-src="`` ` ``">`</code>'], '']);
37
40
  });
38
41
 
39
42
  it('nest', () => {
40
- assert.deepStrictEqual(inspect(parser('`<wbr>`')), [['<code data-src="`&lt;wbr&gt;`">&lt;wbr&gt;</code>'], '']);
41
- assert.deepStrictEqual(inspect(parser('`*u*`')), [['<code data-src="`*u*`">*u*</code>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('`<wbr>`'), ctx), [['<code data-src="`&lt;wbr&gt;`">&lt;wbr&gt;</code>'], '']);
44
+ assert.deepStrictEqual(inspect(parser('`*u*`'), ctx), [['<code data-src="`*u*`">*u*</code>'], '']);
42
45
  });
43
46
 
44
47
  it('trim', () => {
45
- assert.deepStrictEqual(inspect(parser('`a `')), [['<code data-src="`a `">a </code>'], '']);
46
- assert.deepStrictEqual(inspect(parser('` a`')), [['<code data-src="` a`"> a</code>'], '']);
47
- assert.deepStrictEqual(inspect(parser('` a `')), [['<code data-src="` a `">a</code>'], '']);
48
- assert.deepStrictEqual(inspect(parser('` a `')), [['<code data-src="` a `"> a </code>'], '']);
49
- assert.deepStrictEqual(inspect(parser('`\ta\t`')), [['<code data-src="`\ta\t`">\ta\t</code>'], '']);
48
+ assert.deepStrictEqual(inspect(parser('`a `'), ctx), [['<code data-src="`a `">a </code>'], '']);
49
+ assert.deepStrictEqual(inspect(parser('` a`'), ctx), [['<code data-src="` a`"> a</code>'], '']);
50
+ assert.deepStrictEqual(inspect(parser('` a `'), ctx), [['<code data-src="` a `"> a </code>'], '']);
51
+ assert.deepStrictEqual(inspect(parser('` a `'), ctx), [['<code data-src="` a `"> a </code>'], '']);
52
+ assert.deepStrictEqual(inspect(parser('`\ta\t`'), ctx), [['<code data-src="`\ta\t`">\ta\t</code>'], '']);
50
53
  });
51
54
 
52
55
  });
@@ -1,24 +1,31 @@
1
1
  import { CodeParser } from '../inline';
2
- import { validate, isBacktrack, setBacktrack, match } from '../../combinator';
2
+ import { open, match } from '../../combinator';
3
3
  import { Backtrack } from '../context';
4
+ import { invalid } from '../util';
4
5
  import { html } from 'typed-dom/dom';
5
6
 
6
- export const code: CodeParser = validate(
7
- ({ source, context }) =>
8
- source[0] === '`' &&
9
- !isBacktrack(context, [1 | Backtrack.bracket], source),
7
+ export const code: CodeParser = open(
8
+ /^(?=`)/,
10
9
  match(
11
- /^(`+)(?!`)([^\n]*?)(?:((?<!`)\1(?!`))|$|\n)/,
12
- ([whole, , body, closer]) => ({ source, context }) =>
10
+ /^(`+)(?!`)([^\n]*?)(?:((?<!`)\1(?!`))|(?=$|\n))/,
11
+ ([whole, opener, body, closer]) => () =>
13
12
  closer
14
- ? [[html('code', { 'data-src': whole }, format(body))], source.slice(whole.length)]
15
- : void setBacktrack(context, [2 | Backtrack.bracket], source.length),
16
- true));
13
+ ? [[html('code', { 'data-src': whole }, format(body))]]
14
+ : body
15
+ ? [[html('code', {
16
+ class: 'invalid',
17
+ ...invalid('code', 'syntax', `Missing the closing symbol "${opener}"`)
18
+ }, whole)]]
19
+ : [[opener]],
20
+ true),
21
+ false,
22
+ [3 | Backtrack.bracket]);
17
23
 
18
24
  function format(text: string): string {
19
- assert(text.length > 0);
20
- return `${text[0]}${text.at(-1)}` === ' '
21
- && text.trimStart()
25
+ return text.length > 2
26
+ && text[0] === ' '
27
+ && text[1] === '`'
28
+ && text.at(-1) === ' '
22
29
  ? text.slice(1, -1)
23
30
  : text;
24
31
  }
@@ -1,44 +1,46 @@
1
1
  import { deletion } from './deletion';
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/deletion', () => {
6
7
  describe('deletion', () => {
7
- const parser = (source: string) => some(deletion)({ source, context: {} });
8
+ const parser = (source: string) => some(deletion)(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('~~a')), [['~~', 'a'], '']);
14
- assert.deepStrictEqual(inspect(parser('~~a~')), [['~~', 'a', '~'], '']);
15
- assert.deepStrictEqual(inspect(parser(' ~~a~~')), undefined);
12
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
+ assert.deepStrictEqual(inspect(parser('~'), ctx), undefined);
14
+ assert.deepStrictEqual(inspect(parser('~~'), ctx), undefined);
15
+ assert.deepStrictEqual(inspect(parser('~~a'), ctx), [['~~', 'a'], '']);
16
+ assert.deepStrictEqual(inspect(parser('~~a~'), ctx), [['~~', 'a', '~'], '']);
17
+ assert.deepStrictEqual(inspect(parser(' ~~a~~'), ctx), undefined);
16
18
  });
17
19
 
18
20
  it('basic', () => {
19
- assert.deepStrictEqual(inspect(parser('~~a~~')), [['<del>a</del>'], '']);
20
- assert.deepStrictEqual(inspect(parser('~~a~b~~')), [['<del>a~b</del>'], '']);
21
- assert.deepStrictEqual(inspect(parser('~~ ~~')), [['<del> </del>'], '']);
22
- assert.deepStrictEqual(inspect(parser('~~ a~~')), [['<del> a</del>'], '']);
23
- assert.deepStrictEqual(inspect(parser('~~ a ~~')), [['<del> a </del>'], '']);
24
- assert.deepStrictEqual(inspect(parser('~~ a ~~')), [['<del> a </del>'], '']);
25
- assert.deepStrictEqual(inspect(parser('~~\na~~')), [['<del><br>a</del>'], '']);
26
- assert.deepStrictEqual(inspect(parser('~~\\\na~~')), [['<del><br>a</del>'], '']);
27
- assert.deepStrictEqual(inspect(parser('~~<wbr>a~~')), [['<del><wbr>a</del>'], '']);
28
- assert.deepStrictEqual(inspect(parser('~~a ~~')), [['<del>a </del>'], '']);
29
- assert.deepStrictEqual(inspect(parser('~~a \n ~~')), [['<del>a </del>'], '']);
30
- assert.deepStrictEqual(inspect(parser('~~a\n~~')), [['<del>a</del>'], '']);
31
- assert.deepStrictEqual(inspect(parser('~~a\n ~~')), [['<del>a </del>'], '']);
32
- assert.deepStrictEqual(inspect(parser('~~a\n<wbr>~~')), [['<del>a<wbr></del>'], '']);
33
- assert.deepStrictEqual(inspect(parser('~~a\nb~~')), [['<del>a<br>b</del>'], '']);
34
- assert.deepStrictEqual(inspect(parser('~~a\\\nb~~')), [['<del>a<br>b</del>'], '']);
35
- assert.deepStrictEqual(inspect(parser('~~\\~~~')), [['<del>~</del>'], '']);
36
- assert.deepStrictEqual(inspect(parser('~~a~~~')), [['<del>a</del>'], '~']);
21
+ assert.deepStrictEqual(inspect(parser('~~a~~'), ctx), [['<del>a</del>'], '']);
22
+ assert.deepStrictEqual(inspect(parser('~~a~b~~'), ctx), [['<del>a~b</del>'], '']);
23
+ assert.deepStrictEqual(inspect(parser('~~ ~~'), ctx), [['<del> </del>'], '']);
24
+ assert.deepStrictEqual(inspect(parser('~~ a~~'), ctx), [['<del> a</del>'], '']);
25
+ assert.deepStrictEqual(inspect(parser('~~ a ~~'), ctx), [['<del> a </del>'], '']);
26
+ assert.deepStrictEqual(inspect(parser('~~ a ~~'), ctx), [['<del> a </del>'], '']);
27
+ assert.deepStrictEqual(inspect(parser('~~\na~~'), ctx), [['<del><br>a</del>'], '']);
28
+ assert.deepStrictEqual(inspect(parser('~~\\\na~~'), ctx), [['<del><br>a</del>'], '']);
29
+ assert.deepStrictEqual(inspect(parser('~~<wbr>a~~'), ctx), [['<del><wbr>a</del>'], '']);
30
+ assert.deepStrictEqual(inspect(parser('~~a ~~'), ctx), [['<del>a </del>'], '']);
31
+ assert.deepStrictEqual(inspect(parser('~~a \n ~~'), ctx), [['<del>a </del>'], '']);
32
+ assert.deepStrictEqual(inspect(parser('~~a\n~~'), ctx), [['<del>a</del>'], '']);
33
+ assert.deepStrictEqual(inspect(parser('~~a\n ~~'), ctx), [['<del>a </del>'], '']);
34
+ assert.deepStrictEqual(inspect(parser('~~a\n<wbr>~~'), ctx), [['<del>a<wbr></del>'], '']);
35
+ assert.deepStrictEqual(inspect(parser('~~a\nb~~'), ctx), [['<del>a<br>b</del>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('~~a\\\nb~~'), ctx), [['<del>a<br>b</del>'], '']);
37
+ assert.deepStrictEqual(inspect(parser('~~\\~~~'), ctx), [['<del>~</del>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('~~a~~~'), ctx), [['<del>a</del>'], '~']);
37
39
  });
38
40
 
39
41
  it('nest', () => {
40
- assert.deepStrictEqual(inspect(parser('~~*~~a~~*~~')), [['<del><em><del>a</del></em></del>'], '']);
41
- assert.deepStrictEqual(inspect(parser('~~*++a++*~~')), [['<del><em><ins>a</ins></em></del>'], '']);
42
+ assert.deepStrictEqual(inspect(parser('~~*~~a~~*~~'), ctx), [['<del><em><del>a</del></em></del>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('~~*++a++*~~'), ctx), [['<del><em><ins>a</ins></em></del>'], '']);
42
44
  });
43
45
 
44
46
  });
@@ -16,6 +16,6 @@ export const deletion: DeletionParser = lazy(() => validate('~~',
16
16
  open('\n', some(deletion, '~'), true),
17
17
  ]))),
18
18
  '~~', false,
19
- ([, bs], rest) => [bs, rest],
20
- ([, bs], rest) => [push(bs, [Command.Escape]), rest]),
19
+ ([, bs], { buffer }) => [push(buffer!, bs)],
20
+ ([, bs], { buffer }) => bs && [push(push(buffer!, bs), [Command.Cancel])]),
21
21
  nodes => [html('del', defrag(nodes))]))));
@@ -1,53 +1,57 @@
1
1
  import { emphasis } from './emphasis';
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/emphasis', () => {
6
7
  describe('emphasis', () => {
7
- const parser = (source: string) => some(emphasis)({ source, context: {} });
8
+ const parser = (source: string) => some(emphasis)(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**b')), [['*', 'a', '**', 'b'], '']);
18
- assert.deepStrictEqual(inspect(parser('*a**b*')), [['*', 'a', '**', 'b', '*'], '']);
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);
29
- 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**b'), ctx), [['*', 'a', '**', 'b'], '']);
20
+ assert.deepStrictEqual(inspect(parser('* *'), ctx), undefined);
21
+ assert.deepStrictEqual(inspect(parser('* a*'), ctx), undefined);
22
+ assert.deepStrictEqual(inspect(parser('* a *'), ctx), undefined);
23
+ assert.deepStrictEqual(inspect(parser('*\n*'), ctx), undefined);
24
+ assert.deepStrictEqual(inspect(parser('*\na*'), ctx), undefined);
25
+ assert.deepStrictEqual(inspect(parser('*\\ a*'), ctx), undefined);
26
+ assert.deepStrictEqual(inspect(parser('*\\\na*'), ctx), undefined);
27
+ assert.deepStrictEqual(inspect(parser('*<wbr>a*'), ctx), undefined);
28
+ assert.deepStrictEqual(inspect(parser('**a**'), ctx), undefined);
29
+ assert.deepStrictEqual(inspect(parser('***a***'), ctx), undefined);
30
+ assert.deepStrictEqual(inspect(parser(' *a*'), ctx), undefined);
30
31
  });
31
32
 
32
33
  it('basic', () => {
33
- assert.deepStrictEqual(inspect(parser('*a*')), [['<em>a</em>'], '']);
34
- assert.deepStrictEqual(inspect(parser('*ab*')), [['<em>ab</em>'], '']);
35
- assert.deepStrictEqual(inspect(parser('*a**')), [['<em>a</em>'], '*']);
36
- assert.deepStrictEqual(inspect(parser('*a\nb*')), [['<em>a<br>b</em>'], '']);
37
- assert.deepStrictEqual(inspect(parser('*a\\\nb*')), [['<em>a<br>b</em>'], '']);
34
+ assert.deepStrictEqual(inspect(parser('*a*'), ctx), [['<em>a</em>'], '']);
35
+ assert.deepStrictEqual(inspect(parser('*ab*'), ctx), [['<em>ab</em>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('*a**'), ctx), [['<em>a</em>'], '*']);
37
+ assert.deepStrictEqual(inspect(parser('*a\nb*'), ctx), [['<em>a<br>b</em>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('*a\\\nb*'), ctx), [['<em>a<br>b</em>'], '']);
38
39
  });
39
40
 
40
41
  it('nest', () => {
41
- assert.deepStrictEqual(inspect(parser('*a *b**')), [['<em>a <em>b</em></em>'], '']);
42
- assert.deepStrictEqual(inspect(parser('*a **b***')), [['<em>a <strong>b</strong></em>'], '']);
43
- assert.deepStrictEqual(inspect(parser('*a\\ *b**')), [['<em>a <em>b</em></em>'], '']);
44
- assert.deepStrictEqual(inspect(parser('*a&Tab;*b**')), [['<em>a\t<em>b</em></em>'], '']);
45
- assert.deepStrictEqual(inspect(parser('*a<wbr>*b**')), [['<em>a<wbr><em>b</em></em>'], '']);
46
- assert.deepStrictEqual(inspect(parser('*a**b**c*')), [['<em>a<strong>b</strong>c</em>'], '']);
47
- assert.deepStrictEqual(inspect(parser('*a**b**c*d')), [['<em>a<strong>b</strong>c</em>'], 'd']);
48
- assert.deepStrictEqual(inspect(parser('*`a`*')), [['<em><code data-src="`a`">a</code></em>'], '']);
49
- assert.deepStrictEqual(inspect(parser('*(*a*)*')), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);
50
- assert.deepStrictEqual(inspect(parser('*(**a**)*')), [['<em><span class="paren">(<strong>a</strong>)</span></em>'], '']);
42
+ assert.deepStrictEqual(inspect(parser('*a *b**'), ctx), [['<em>a <em>b</em></em>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('*a **b***'), ctx), [['<em>a <strong>b</strong></em>'], '']);
44
+ assert.deepStrictEqual(inspect(parser('*a\\ *b**'), ctx), [['<em>a <em>b</em></em>'], '']);
45
+ assert.deepStrictEqual(inspect(parser('*a&Tab;*b**'), ctx), [['<em>a\t<em>b</em></em>'], '']);
46
+ assert.deepStrictEqual(inspect(parser('*a<wbr>*b**'), ctx), [['<em>a<wbr><em>b</em></em>'], '']);
47
+ assert.deepStrictEqual(inspect(parser('*a**b*'), ctx), [['<em>a**b</em>'], '']);
48
+ assert.deepStrictEqual(inspect(parser('*a**b**'), ctx), [[ '*', 'a', '<strong>b</strong>'], '']);
49
+ assert.deepStrictEqual(inspect(parser('*a**b**c'), ctx), [['*', 'a', '<strong>b</strong>', 'c'], '']);
50
+ assert.deepStrictEqual(inspect(parser('*a**b**c*'), ctx), [['<em>a<strong>b</strong>c</em>'], '']);
51
+ assert.deepStrictEqual(inspect(parser('*a**b**c*d'), ctx), [['<em>a<strong>b</strong>c</em>'], 'd']);
52
+ assert.deepStrictEqual(inspect(parser('*`a`*'), ctx), [['<em><code data-src="`a`">a</code></em>'], '']);
53
+ assert.deepStrictEqual(inspect(parser('*(*a*)*'), ctx), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);
54
+ assert.deepStrictEqual(inspect(parser('*(**a**)*'), ctx), [['<em><span class="paren">(<strong>a</strong>)</span></em>'], '']);
51
55
  });
52
56
 
53
57
  });
@@ -22,5 +22,5 @@ export const emphasis: EmphasisParser = lazy(() => surround(
22
22
  ])),
23
23
  ]))))),
24
24
  str('*'), false,
25
- ([, bs], rest) => [[html('em', defrag(bs))], rest],
26
- ([as, bs], rest) => [unshift(as, bs), rest]));
25
+ ([, bs]) => [[html('em', defrag(bs))]],
26
+ ([as, bs]) => bs && [unshift(as, bs)]));