securemark 0.292.0 → 0.293.1

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 (127) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/index.js +597 -416
  3. package/markdown.d.ts +35 -60
  4. package/package.json +1 -1
  5. package/src/combinator/control/constraint/contract.ts +6 -15
  6. package/src/combinator/control/manipulation/clear.ts +3 -4
  7. package/src/combinator/control/manipulation/fence.ts +3 -1
  8. package/src/combinator/control/manipulation/indent.ts +5 -11
  9. package/src/combinator/control/manipulation/match.ts +3 -2
  10. package/src/combinator/control/manipulation/recovery.ts +1 -1
  11. package/src/combinator/control/manipulation/scope.ts +3 -10
  12. package/src/combinator/control/manipulation/surround.ts +4 -24
  13. package/src/combinator/data/parser/context/delimiter.ts +10 -9
  14. package/src/combinator/data/parser/context.ts +31 -0
  15. package/src/combinator/data/parser/inits.ts +1 -1
  16. package/src/combinator/data/parser/sequence.ts +1 -1
  17. package/src/combinator/data/parser/some.test.ts +1 -1
  18. package/src/combinator/data/parser/some.ts +4 -5
  19. package/src/combinator/data/parser.ts +0 -1
  20. package/src/combinator.ts +0 -1
  21. package/src/parser/api/parse.test.ts +16 -8
  22. package/src/parser/api/parse.ts +1 -2
  23. package/src/parser/autolink.test.ts +7 -7
  24. package/src/parser/autolink.ts +2 -4
  25. package/src/parser/block/blockquote.test.ts +1 -1
  26. package/src/parser/block/blockquote.ts +7 -7
  27. package/src/parser/block/codeblock.ts +8 -8
  28. package/src/parser/block/dlist.test.ts +1 -1
  29. package/src/parser/block/dlist.ts +5 -6
  30. package/src/parser/block/extension/aside.ts +4 -4
  31. package/src/parser/block/extension/example.ts +4 -4
  32. package/src/parser/block/extension/fig.ts +5 -5
  33. package/src/parser/block/extension/figbase.ts +1 -1
  34. package/src/parser/block/extension/figure.test.ts +1 -1
  35. package/src/parser/block/extension/figure.ts +6 -6
  36. package/src/parser/block/extension/message.ts +4 -4
  37. package/src/parser/block/extension/placeholder.ts +8 -8
  38. package/src/parser/block/extension/table.test.ts +1 -1
  39. package/src/parser/block/extension/table.ts +32 -22
  40. package/src/parser/block/extension.ts +3 -3
  41. package/src/parser/block/heading.test.ts +1 -1
  42. package/src/parser/block/heading.ts +2 -2
  43. package/src/parser/block/ilist.test.ts +3 -3
  44. package/src/parser/block/ilist.ts +5 -5
  45. package/src/parser/block/mathblock.ts +8 -8
  46. package/src/parser/block/mediablock.ts +6 -6
  47. package/src/parser/block/olist.test.ts +16 -14
  48. package/src/parser/block/olist.ts +13 -13
  49. package/src/parser/block/pagebreak.ts +1 -1
  50. package/src/parser/block/paragraph.test.ts +3 -4
  51. package/src/parser/block/paragraph.ts +1 -2
  52. package/src/parser/block/reply/cite.ts +7 -9
  53. package/src/parser/block/reply/quote.ts +6 -6
  54. package/src/parser/block/reply.ts +3 -3
  55. package/src/parser/block/sidefence.ts +3 -3
  56. package/src/parser/block/table.ts +13 -13
  57. package/src/parser/block/ulist.test.ts +8 -7
  58. package/src/parser/block/ulist.ts +6 -7
  59. package/src/parser/block.ts +48 -15
  60. package/src/parser/context.ts +4 -4
  61. package/src/parser/header.ts +3 -3
  62. package/src/parser/inline/annotation.ts +1 -1
  63. package/src/parser/inline/autolink/account.test.ts +8 -7
  64. package/src/parser/inline/autolink/account.ts +11 -8
  65. package/src/parser/inline/autolink/anchor.test.ts +1 -1
  66. package/src/parser/inline/autolink/anchor.ts +21 -17
  67. package/src/parser/inline/autolink/channel.test.ts +8 -8
  68. package/src/parser/inline/autolink/channel.ts +40 -15
  69. package/src/parser/inline/autolink/email.test.ts +15 -15
  70. package/src/parser/inline/autolink/email.ts +5 -7
  71. package/src/parser/inline/autolink/hashnum.test.ts +4 -9
  72. package/src/parser/inline/autolink/hashnum.ts +8 -4
  73. package/src/parser/inline/autolink/hashtag.test.ts +9 -10
  74. package/src/parser/inline/autolink/hashtag.ts +9 -6
  75. package/src/parser/inline/autolink/url.test.ts +72 -74
  76. package/src/parser/inline/autolink/url.ts +19 -24
  77. package/src/parser/inline/autolink.ts +21 -24
  78. package/src/parser/inline/bracket.ts +3 -3
  79. package/src/parser/inline/code.ts +2 -2
  80. package/src/parser/inline/deletion.test.ts +2 -2
  81. package/src/parser/inline/deletion.ts +1 -1
  82. package/src/parser/inline/emphasis.test.ts +5 -5
  83. package/src/parser/inline/emphasis.ts +2 -7
  84. package/src/parser/inline/emstrong.test.ts +14 -14
  85. package/src/parser/inline/emstrong.ts +4 -16
  86. package/src/parser/inline/extension/index.test.ts +5 -3
  87. package/src/parser/inline/extension/index.ts +8 -10
  88. package/src/parser/inline/extension/indexer.test.ts +1 -2
  89. package/src/parser/inline/extension/indexer.ts +3 -3
  90. package/src/parser/inline/extension/label.ts +1 -1
  91. package/src/parser/inline/extension/placeholder.ts +1 -1
  92. package/src/parser/inline/html.test.ts +2 -2
  93. package/src/parser/inline/html.ts +21 -20
  94. package/src/parser/inline/htmlentity.ts +4 -4
  95. package/src/parser/inline/insertion.test.ts +2 -2
  96. package/src/parser/inline/insertion.ts +1 -1
  97. package/src/parser/inline/italic.test.ts +9 -9
  98. package/src/parser/inline/italic.ts +1 -1
  99. package/src/parser/inline/link.ts +14 -19
  100. package/src/parser/inline/mark.test.ts +5 -5
  101. package/src/parser/inline/mark.ts +1 -1
  102. package/src/parser/inline/math.test.ts +6 -6
  103. package/src/parser/inline/math.ts +9 -13
  104. package/src/parser/inline/media.ts +9 -14
  105. package/src/parser/inline/reference.test.ts +4 -4
  106. package/src/parser/inline/reference.ts +5 -5
  107. package/src/parser/inline/remark.test.ts +19 -23
  108. package/src/parser/inline/remark.ts +17 -19
  109. package/src/parser/inline/ruby.ts +5 -3
  110. package/src/parser/inline/shortmedia.ts +6 -9
  111. package/src/parser/inline/strong.test.ts +5 -5
  112. package/src/parser/inline/strong.ts +2 -7
  113. package/src/parser/inline.test.ts +25 -23
  114. package/src/parser/inline.ts +21 -9
  115. package/src/parser/segment.ts +23 -5
  116. package/src/parser/source/escapable.test.ts +6 -6
  117. package/src/parser/source/escapable.ts +20 -5
  118. package/src/parser/source/line.ts +28 -4
  119. package/src/parser/source/str.ts +5 -27
  120. package/src/parser/source/text.test.ts +60 -60
  121. package/src/parser/source/text.ts +121 -6
  122. package/src/parser/source/unescapable.test.ts +8 -8
  123. package/src/parser/source/unescapable.ts +19 -3
  124. package/src/parser/util.ts +3 -3
  125. package/src/parser/visibility.ts +45 -40
  126. package/src/combinator/control/manipulation/trim.test.ts +0 -23
  127. package/src/combinator/control/manipulation/trim.ts +0 -17
@@ -1,99 +1,97 @@
1
- import { autolink } from '../autolink';
1
+ import { inline } from '../../inline';
2
2
  import { some } from '../../../combinator';
3
3
  import { input } from '../../../combinator/data/parser';
4
4
  import { inspect } from '../../../debug.test';
5
5
 
6
6
  describe('Unit: parser/inline/autolink/url', () => {
7
7
  describe('url', () => {
8
- const parser = (source: string) => some(autolink)(input(source, ctx));
8
+ const parser = (source: string) => some(inline)(input(source, ctx));
9
9
  const { context: ctx } = input('', {});
10
10
 
11
11
  it('invalid', () => {
12
12
  assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
13
- assert.deepStrictEqual(inspect(parser('http'), ctx), [['http'], '']);
14
- assert.deepStrictEqual(inspect(parser('ttp'), ctx), [['ttp'], '']);
15
- assert.deepStrictEqual(inspect(parser('http://'), ctx), [['http'], '://']);
16
- assert.deepStrictEqual(inspect(parser('http://['), ctx), [['http'], '://[']);
17
- assert.deepStrictEqual(inspect(parser('http://]'), ctx), [['http'], '://]']);
18
- assert.deepStrictEqual(inspect(parser('Http://host'), ctx), [['Http'], '://host']);
19
- assert.deepStrictEqual(inspect(parser('http://[::ffff:0:0%1]'), ctx), [['<a class="invalid">http://[::ffff:0:0%1]</a>'], '']);
20
- assert.deepStrictEqual(inspect(parser('http://[::ffff:0:0/96]'), ctx), [['<a class="invalid">http://[::ffff:0:0/96]</a>'], '']);
21
- assert.deepStrictEqual(inspect(parser(' http://host'), ctx), undefined);
13
+ assert.deepStrictEqual(inspect(parser(' http'), ctx), [[' http'], '']);
14
+ assert.deepStrictEqual(inspect(parser(' ttp'), ctx), [[' ttp'], '']);
15
+ assert.deepStrictEqual(inspect(parser(' http://'), ctx), [[' ', 'http:', '/', '/'], '']);
16
+ assert.deepStrictEqual(inspect(parser(' http://['), ctx), [[' ', 'http:', '/', '/', '['], '']);
17
+ assert.deepStrictEqual(inspect(parser(' http://]'), ctx), [[' ', 'http:', '/', '/', ']'], '']);
18
+ assert.deepStrictEqual(inspect(parser(' Http://host'), ctx), [[' ', 'Http:', '/', '/host'], '']);
19
+ assert.deepStrictEqual(inspect(parser(' http://[::ffff:0:0%1]'), ctx), [[' ', '<a class="invalid">http://[::ffff:0:0%1]</a>'], '']);
20
+ assert.deepStrictEqual(inspect(parser(' http://[::ffff:0:0/96]'), ctx), [[' ', '<a class="invalid">http://[::ffff:0:0/96]</a>'], '']);
22
21
  });
23
22
 
24
23
  it('basic', () => {
25
- assert.deepStrictEqual(inspect(parser('http://a'), ctx), [['<a class="url" href="http://a" target="_blank">http://a</a>'], '']);
26
- assert.deepStrictEqual(inspect(parser('http://a/'), ctx), [['<a class="url" href="http://a/" target="_blank">http://a/</a>'], '']);
27
- assert.deepStrictEqual(inspect(parser('http://a:80'), ctx), [['<a class="url" href="http://a:80" target="_blank">http://a:80</a>'], '']);
28
- assert.deepStrictEqual(inspect(parser('http://a.b'), ctx), [['<a class="url" href="http://a.b" target="_blank">http://a.b</a>'], '']);
29
- assert.deepStrictEqual(inspect(parser(`http://a?#${encodeURIComponent(':/[]()<>?#=& ')}`), ctx), [['<a class="url" href="http://a?#%3A%2F%5B%5D()%3C%3E%3F%23%3D%26%20" target="_blank">http://a?#%3A%2F[]()&lt;&gt;%3F%23%3D%26%20</a>'], '']);
30
- assert.deepStrictEqual(inspect(parser('http://a#()'), ctx), [['<a class="url" href="http://a#()" target="_blank">http://a#()</a>'], '']);
31
- assert.deepStrictEqual(inspect(parser('http://a#( )'), ctx), [['<a class="url" href="http://a#" target="_blank">http://a#</a>'], '( )']);
32
- assert.deepStrictEqual(inspect(parser('http://a#(\n)'), ctx), [['<a class="url" href="http://a#" target="_blank">http://a#</a>'], '(\n)']);
33
- assert.deepStrictEqual(inspect(parser('http://[::]'), ctx), [['<a class="url" href="http://[::]" target="_blank">http://[::]</a>'], '']);
34
- assert.deepStrictEqual(inspect(parser('\rhttp://a#\\'), ctx), [['<a class="url" href="http://a#\\" target="_blank">http://a#\\</a>'], '']);
35
- assert.deepStrictEqual(inspect(parser('\rhttp://a#\\\nhttp://b#\\'), ctx), [['<a class="url" href="http://a#\\" target="_blank">http://a#\\</a>', '<br>', '<a class="url" href="http://b#\\" target="_blank">http://b#\\</a>'], '']);
24
+ assert.deepStrictEqual(inspect(parser(' http://a'), ctx), [[' ', '<a class="url" href="http://a" target="_blank">http://a</a>'], '']);
25
+ assert.deepStrictEqual(inspect(parser(' http://a/'), ctx), [[' ', '<a class="url" href="http://a/" target="_blank">http://a/</a>'], '']);
26
+ assert.deepStrictEqual(inspect(parser(' http://a:80'), ctx), [[' ', '<a class="url" href="http://a:80" target="_blank">http://a:80</a>'], '']);
27
+ assert.deepStrictEqual(inspect(parser(' http://a.b'), ctx), [[' ', '<a class="url" href="http://a.b" target="_blank">http://a.b</a>'], '']);
28
+ assert.deepStrictEqual(inspect(parser(` http://a?#${encodeURIComponent(':/[]()<>?#=& ')}`), ctx), [[' ', '<a class="url" href="http://a?#%3A%2F%5B%5D()%3C%3E%3F%23%3D%26%20" target="_blank">http://a?#%3A%2F[]()&lt;&gt;%3F%23%3D%26%20</a>'], '']);
29
+ assert.deepStrictEqual(inspect(parser(' http://a#()'), ctx), [[' ', '<a class="url" href="http://a#()" target="_blank">http://a#()</a>'], '']);
30
+ assert.deepStrictEqual(inspect(parser(' http://a#( )'), ctx), [[' ', '<a class="url" href="http://a#" target="_blank">http://a#</a>', '<span class="paren">( )</span>'], '']);
31
+ assert.deepStrictEqual(inspect(parser(' http://a#(\n)'), ctx), [[' ', '<a class="url" href="http://a#" target="_blank">http://a#</a>', '<span class="paren">(<br>)</span>'], '']);
32
+ assert.deepStrictEqual(inspect(parser(' http://[::]'), ctx), [[' ', '<a class="url" href="http://[::]" target="_blank">http://[::]</a>'], '']);
33
+ assert.deepStrictEqual(inspect(parser('http://a#\\'), ctx), [['<a class="url" href="http://a#\\" target="_blank">http://a#\\</a>'], '']);
34
+ assert.deepStrictEqual(inspect(parser('http://a#\\\nhttp://b#\\'), ctx), [['<a class="url" href="http://a#\\" target="_blank">http://a#\\</a>', '<br>', '<a class="url" href="http://b#\\" target="_blank">http://b#\\</a>'], '']);
36
35
  });
37
36
 
38
37
  it('trailing symbols', () => {
39
- assert.deepStrictEqual(inspect(parser('http://host '), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], ' ']);
40
- assert.deepStrictEqual(inspect(parser('http://host. '), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '. ']);
41
- assert.deepStrictEqual(inspect(parser('http://host\n'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '\n']);
42
- assert.deepStrictEqual(inspect(parser('http://host.\n'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '.\n']);
43
- assert.deepStrictEqual(inspect(parser('http://host\\'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '\\']);
44
- assert.deepStrictEqual(inspect(parser('http://host.\\'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '.\\']);
45
- assert.deepStrictEqual(inspect(parser('http://host\\ '), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '\\ ']);
46
- assert.deepStrictEqual(inspect(parser('http://host.\\ '), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '.\\ ']);
47
- assert.deepStrictEqual(inspect(parser('http://host\\\n'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '\\\n']);
48
- assert.deepStrictEqual(inspect(parser('http://host.\\\n'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '.\\\n']);
49
- assert.deepStrictEqual(inspect(parser('http://host,'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], ',']);
50
- assert.deepStrictEqual(inspect(parser('http://host;'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], ';']);
51
- assert.deepStrictEqual(inspect(parser('http://host.'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '.']);
52
- assert.deepStrictEqual(inspect(parser('http://host:'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], ':']);
53
- assert.deepStrictEqual(inspect(parser('http://host!'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '!']);
54
- assert.deepStrictEqual(inspect(parser('http://host?'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '?']);
55
- assert.deepStrictEqual(inspect(parser('http://host+'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '+']);
56
- assert.deepStrictEqual(inspect(parser('http://host-'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '-']);
57
- assert.deepStrictEqual(inspect(parser('http://host*'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '*']);
58
- assert.deepStrictEqual(inspect(parser('http://host='), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '=']);
59
- assert.deepStrictEqual(inspect(parser('http://host~'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '~']);
60
- assert.deepStrictEqual(inspect(parser('http://host^'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '^']);
61
- assert.deepStrictEqual(inspect(parser('http://host_'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '_']);
62
- assert.deepStrictEqual(inspect(parser('http://host/'), ctx), [['<a class="url" href="http://host/" target="_blank">http://host/</a>'], '']);
63
- assert.deepStrictEqual(inspect(parser('http://host//'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '//']);
64
- assert.deepStrictEqual(inspect(parser(`http://host'`), ctx), [['<a class="url" href="http://host\'" target="_blank">http://host\'</a>'], '']);
65
- assert.deepStrictEqual(inspect(parser('http://host"'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '"']);
66
- assert.deepStrictEqual(inspect(parser('http://host`'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '`']);
67
- assert.deepStrictEqual(inspect(parser('http://host|'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '|']);
68
- assert.deepStrictEqual(inspect(parser('http://host&'), ctx), [['<a class="url" href="http://host&amp;" target="_blank">http://host&amp;</a>'], '']);
69
- assert.deepStrictEqual(inspect(parser('http://host$'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '$']);
70
- assert.deepStrictEqual(inspect(parser('http://host#"$"'), ctx), [['<a class="url" href="http://host#" target="_blank">http://host#</a>'], '"$"']);
71
- assert.deepStrictEqual(inspect(parser('http://host#($)'), ctx), [['<a class="url" href="http://host#" target="_blank">http://host#</a>'], '($)']);
72
- assert.deepStrictEqual(inspect(parser('http://host#(($))'), ctx), [['<a class="url" href="http://host#" target="_blank">http://host#</a>'], '(($))']);
73
- assert.deepStrictEqual(inspect(parser('http://user@host'), ctx), [['<a class="url" href="http://user@host" target="_blank">http://user@host</a>'], '']);
74
- assert.deepStrictEqual(inspect(parser('http://host#@'), ctx), [['<a class="url" href="http://host#@" target="_blank">http://host#@</a>'], '']);
75
- assert.deepStrictEqual(inspect(parser('http://host['), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '[']);
76
- assert.deepStrictEqual(inspect(parser('http://host]'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], ']']);
77
- assert.deepStrictEqual(inspect(parser('http://host('), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '(']);
78
- assert.deepStrictEqual(inspect(parser('http://host)'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], ')']);
79
- assert.deepStrictEqual(inspect(parser('http://host{'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '{']);
80
- assert.deepStrictEqual(inspect(parser('http://host}'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '}']);
81
- assert.deepStrictEqual(inspect(parser('http://host<'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '<']);
82
- assert.deepStrictEqual(inspect(parser('http://host>'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '>']);
83
- assert.deepStrictEqual(inspect(parser('http://host('), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '(']);
84
- assert.deepStrictEqual(inspect(parser('http://host)'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], ')']);
85
- assert.deepStrictEqual(inspect(parser('http://host\\"'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '\\"']);
86
- assert.deepStrictEqual(inspect(parser('http://host!?**.*--++==~~^^'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '!?**.*--++==~~^^']);
38
+ assert.deepStrictEqual(inspect(parser(' http://host '), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
39
+ assert.deepStrictEqual(inspect(parser(' http://host. '), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '.'], '']);
40
+ assert.deepStrictEqual(inspect(parser(' http://host\n'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '<br>'], '']);
41
+ assert.deepStrictEqual(inspect(parser(' http://host.\n'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '.', '<br>'], '']);
42
+ assert.deepStrictEqual(inspect(parser(' http://host\\'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
43
+ assert.deepStrictEqual(inspect(parser(' http://host.\\'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '.'], '']);
44
+ assert.deepStrictEqual(inspect(parser(' http://host\\ '), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', ' '], '']);
45
+ assert.deepStrictEqual(inspect(parser(' http://host.\\ '), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '.', ' '], '']);
46
+ assert.deepStrictEqual(inspect(parser(' http://host\\\n'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '<br>'], '']);
47
+ assert.deepStrictEqual(inspect(parser(' http://host.\\\n'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '.', '<br>'], '']);
48
+ assert.deepStrictEqual(inspect(parser(' http://host,'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', ','], '']);
49
+ assert.deepStrictEqual(inspect(parser(' http://host;'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', ';'], '']);
50
+ assert.deepStrictEqual(inspect(parser(' http://host.'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '.'], '']);
51
+ assert.deepStrictEqual(inspect(parser(' http://host:'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', ':'], '']);
52
+ assert.deepStrictEqual(inspect(parser(' http://host!'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '!'], '']);
53
+ assert.deepStrictEqual(inspect(parser(' http://host?'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '?'], '']);
54
+ assert.deepStrictEqual(inspect(parser(' http://host+'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '+'], '']);
55
+ assert.deepStrictEqual(inspect(parser(' http://host-'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '-'], '']);
56
+ assert.deepStrictEqual(inspect(parser(' http://host*'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '*'], '']);
57
+ assert.deepStrictEqual(inspect(parser(' http://host='), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '='], '']);
58
+ assert.deepStrictEqual(inspect(parser(' http://host~'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '~'], '']);
59
+ assert.deepStrictEqual(inspect(parser(' http://host^'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '^'], '']);
60
+ assert.deepStrictEqual(inspect(parser(' http://host_'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '_'], '']);
61
+ assert.deepStrictEqual(inspect(parser(' http://host/'), ctx), [[' ', '<a class="url" href="http://host/" target="_blank">http://host/</a>'], '']);
62
+ assert.deepStrictEqual(inspect(parser(' http://host//'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '/', '/'], '']);
63
+ assert.deepStrictEqual(inspect(parser(` http://host'`), ctx), [[' ', '<a class="url" href="http://host\'" target="_blank">http://host\'</a>'], '']);
64
+ assert.deepStrictEqual(inspect(parser(' http://host"'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '"'], '']);
65
+ assert.deepStrictEqual(inspect(parser(' http://host`'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '`'], '']);
66
+ assert.deepStrictEqual(inspect(parser(' http://host|'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '|'], '']);
67
+ assert.deepStrictEqual(inspect(parser(' http://host&'), ctx), [[' ', '<a class="url" href="http://host&amp;" target="_blank">http://host&amp;</a>'], '']);
68
+ assert.deepStrictEqual(inspect(parser(' http://host$'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '$'], '']);
69
+ assert.deepStrictEqual(inspect(parser(' http://host#"$"'), ctx), [[' ', '<a class="url" href="http://host#" target="_blank">http://host#</a>', '"', '$', '"'], '']);
70
+ assert.deepStrictEqual(inspect(parser(' http://host#($)'), ctx), [[' ', '<a class="url" href="http://host#" target="_blank">http://host#</a>', '<span class="paren">($)</span>'], '']);
71
+ assert.deepStrictEqual(inspect(parser(' http://host#(($))'), ctx), [[' ', '<a class="url" href="http://host#" target="_blank">http://host#</a>', '<sup class="annotation"><span>$</span></sup>'], '']);
72
+ assert.deepStrictEqual(inspect(parser(' http://user@host'), ctx), [[' ', '<a class="url" href="http://user@host" target="_blank">http://user@host</a>'], '']);
73
+ assert.deepStrictEqual(inspect(parser(' http://host#@'), ctx), [[' ', '<a class="url" href="http://host#@" target="_blank">http://host#@</a>'], '']);
74
+ assert.deepStrictEqual(inspect(parser(' http://host['), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '['], '']);
75
+ assert.deepStrictEqual(inspect(parser(' http://host]'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', ']'], '']);
76
+ assert.deepStrictEqual(inspect(parser(' http://host('), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '('], '']);
77
+ assert.deepStrictEqual(inspect(parser(' http://host)'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', ')'], '']);
78
+ assert.deepStrictEqual(inspect(parser(' http://host{'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '{'], '']);
79
+ assert.deepStrictEqual(inspect(parser(' http://host}'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '}'], '']);
80
+ assert.deepStrictEqual(inspect(parser(' http://host<'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '<'], '']);
81
+ assert.deepStrictEqual(inspect(parser(' http://host>'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '>'], '']);
82
+ assert.deepStrictEqual(inspect(parser(' http://host('), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '('], '']);
83
+ assert.deepStrictEqual(inspect(parser(' http://host)'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', ')'], '']);
84
+ assert.deepStrictEqual(inspect(parser(' http://host\\"'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>', '"'], '']);
87
85
  });
88
86
 
89
87
  it('trailing entities', () => {
90
- assert.deepStrictEqual(inspect(parser('http://host?&hl;'), ctx), [['<a class="url" href="http://host?&amp;hl" target="_blank">http://host?&amp;hl</a>'], ';']);
91
- assert.deepStrictEqual(inspect(parser('http://host?&hl;&hl;'), ctx), [['<a class="url" href="http://host?&amp;hl;&amp;hl" target="_blank">http://host?&amp;hl;&amp;hl</a>'], ';']);
88
+ assert.deepStrictEqual(inspect(parser(' http://host?&hl;'), ctx), [[' ', '<a class="url" href="http://host?&amp;hl" target="_blank">http://host?&amp;hl</a>', ';'], '']);
89
+ assert.deepStrictEqual(inspect(parser(' http://host?&hl;&hl;'), ctx), [[' ', '<a class="url" href="http://host?&amp;hl;&amp;hl" target="_blank">http://host?&amp;hl;&amp;hl</a>', ';'], '']);
92
90
  });
93
91
 
94
92
  it('protocol', () => {
95
- assert.deepStrictEqual(inspect(parser('http://host'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
96
- assert.deepStrictEqual(inspect(parser('https://host'), ctx), [['<a class="url" href="https://host" target="_blank">https://host</a>'], '']);
93
+ assert.deepStrictEqual(inspect(parser(' http://host'), ctx), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
94
+ assert.deepStrictEqual(inspect(parser(' https://host'), ctx), [[' ', '<a class="url" href="https://host" target="_blank">https://host</a>'], '']);
97
95
  });
98
96
 
99
97
  });
@@ -1,17 +1,16 @@
1
1
  import { AutolinkParser } from '../../inline';
2
2
  import { State, Recursion, Backtrack } from '../../context';
3
- import { union, tails, some, recursion, precedence, state, constraint, validate, verify, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
3
+ import { union, tails, some, recursion, precedence, state, constraint, verify, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
4
4
  import { unsafelink } from '../link';
5
- import { linebreak, unescsource, str } from '../../source';
5
+ import { unescsource, str } from '../../source';
6
6
 
7
- export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'https://'], rewrite(
7
+ export const url: AutolinkParser.UrlParser = lazy(() => rewrite(
8
8
  open(
9
- /^https?:\/\/(?=[\x21-\x7E])/,
9
+ /(?<![0-9a-z][.+-]?)https?:\/\/(?=[\x21-\x7E])/y,
10
10
  precedence(1, some(union([
11
11
  verify(bracket, ns => ns.length > 0),
12
- // 再帰に注意
13
- some(unescsource, /^[-+*=~^_/,.;:!?]{2}|^[-+*=~^_,.;:!?]?(?=[\\"`|\[\](){}<>]|[^\x21-\x7E]|$)/),
14
- ]), undefined, [[/^[^\x21-\x7E]|^\$/, 9]])),
12
+ some(unescsource, /([-+*=~^_/])\1|[,.;:!?]{2}|[-+*=~^_,.;:!?]?(?=[\\"`\[\](){}<>()[]{}|]|[^\x21-\x7E]|$)/y),
13
+ ]), undefined, [[/[^\x21-\x7E]|\$/y, 9]])),
15
14
  false,
16
15
  [3 | Backtrack.autolink]),
17
16
  union([
@@ -20,24 +19,20 @@ export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'ht
20
19
  unsafelink,
21
20
  false))),
22
21
  ({ context: { source } }) => [[source]],
23
- ]))));
22
+ ])));
24
23
 
25
- export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => open(
26
- linebreak,
27
- focus(
28
- /^!?https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
29
- tails([
30
- str('!'),
31
- union([
32
- constraint(State.autolink, state(State.autolink, convert(
33
- url => `{ ${url} }`,
34
- unsafelink,
35
- false))),
36
- ({ context: { source } }) => [[source]],
37
- ]),
38
- ])),
39
- false,
40
- [3 | Backtrack.autolink]));
24
+ export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => focus(
25
+ /(?<=^|[\r\n])!?https?:\/\/\S+(?=[^\S\n]*(?=$|\n))/y,
26
+ tails([
27
+ str('!'),
28
+ union([
29
+ constraint(State.autolink, state(State.autolink, convert(
30
+ url => `{ ${url} }`,
31
+ unsafelink,
32
+ false))),
33
+ ({ context: { source } }) => [[source]],
34
+ ]),
35
+ ])));
41
36
 
42
37
  const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => union([
43
38
  surround(str('('), recursion(Recursion.terminal, some(union([bracket, unescsource]), ')')), str(')'), true,
@@ -1,6 +1,6 @@
1
1
  import { AutolinkParser } from '../inline';
2
2
  import { State } from '../context';
3
- import { union, some, state, validate, lazy, fmap } from '../../combinator';
3
+ import { union, state, validate, lazy } from '../../combinator';
4
4
  import { url, lineurl } from './autolink/url';
5
5
  import { email } from './autolink/email';
6
6
  import { channel } from './autolink/channel';
@@ -9,31 +9,28 @@ import { hashtag, emoji } from './autolink/hashtag';
9
9
  import { hashnum } from './autolink/hashnum';
10
10
  import { anchor } from './autolink/anchor';
11
11
  import { str } from '../source';
12
- import { stringify } from '../util';
13
12
 
14
13
  export const autolink: AutolinkParser = lazy(() =>
15
- validate(/^(?:[@#>0-9a-z]|\S#|[0-9a-z]>|[\r\n]!?https?:\/\/)/iu,
14
+ validate(new RegExp([
15
+ /(?<![0-9a-z])@/yi.source,
16
+ /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source,
17
+ /(?<![0-9a-z])>>/yi.source,
18
+ /(?<![0-9a-z][.+-]?)!?[0-9a-z]/yi.source,
19
+ ].join('|').replace(/emoji/g, emoji), 'yiu'),
16
20
  state(~State.autolink,
17
21
  union([
18
- some(union([lineurl])),
19
- fmap(some(union([
20
- url,
21
- email,
22
- // Escape unmatched email-like strings.
23
- str(/^[0-9a-z]+(?:[_.+-][0-9a-z]+|@(?=@))*/i),
24
- channel,
25
- account,
26
- // Escape unmatched account-like strings.
27
- str(/^@+(?:[0-9a-z]+(?:[_.+-][0-9a-z]+)*)?/i),
28
- // Escape invalid leading characters.
29
- str(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji)(?=#)/u.source.replace('emoji', emoji), 'u')),
30
- hashtag,
31
- hashnum,
32
- // Escape unmatched hashtag-like strings.
33
- str(new RegExp(/^#+(?:(?:[^\p{C}\p{S}\p{P}\s]|emoji)+(?:['_.+-](?:[^\p{C}\p{S}\p{P}\s]|emoji)+)*)?/u.source.replace(/emoji/g, emoji), 'u')),
34
- // Escape invalid leading characters.
35
- str(/^[0-9a-z](?=>)/iu),
36
- anchor,
37
- ])),
38
- ns => ns.length === 1 ? ns : [stringify(ns)]),
22
+ lineurl,
23
+ url,
24
+ email,
25
+ // Escape unmatched email-like strings.
26
+ str(/[0-9a-z]+(?:[_.+-][0-9a-z]+[:@]?|:|@(?=@))*/yi),
27
+ channel,
28
+ account,
29
+ // Escape unmatched account-like strings.
30
+ str(/@+(?:[0-9a-z]+(?:[_.+-][0-9a-z]+)*)?/yi),
31
+ hashtag,
32
+ hashnum,
33
+ // Escape unmatched hashtag-like strings.
34
+ str(new RegExp(/#+(?:(?:[^\p{C}\p{S}\p{P}\s]|emoji)+(?:['_.+-](?:[^\p{C}\p{S}\p{P}\s]|emoji)+)*)?/yu.source.replace(/emoji/g, emoji), 'yu')),
35
+ anchor,
39
36
  ]))));
@@ -1,6 +1,6 @@
1
1
  import { BracketParser } from '../inline';
2
2
  import { State, Recursion, Backtrack } from '../context';
3
- import { union, some, recursion, precedence, surround, isBacktrack, setBacktrack, lazy } from '../../combinator';
3
+ import { union, some, recursion, precedence, validate, surround, isBacktrack, setBacktrack, lazy } from '../../combinator';
4
4
  import { inline } from '../inline';
5
5
  import { textlink } from './link';
6
6
  import { str } from '../source';
@@ -11,7 +11,7 @@ const indexA = /^[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*$/;
11
11
  const indexF = new RegExp(indexA.source.replace(', ', '[,、]')
12
12
  .replace(/[09AZaz.]|\-(?!\w)/g, c => String.fromCodePoint(c.codePointAt(0)! + 0xFEE0)));
13
13
 
14
- export const bracket: BracketParser = lazy(() => union([
14
+ export const bracket: BracketParser = lazy(() => validate(/[([{([{"]/y, union([
15
15
  surround(
16
16
  str('('),
17
17
  precedence(1, recursion(Recursion.bracket, some(inline, ')', [[')', 1]]))),
@@ -100,4 +100,4 @@ export const bracket: BracketParser = lazy(() => union([
100
100
  : (context.position -= 1, [unshift(as, bs)]),
101
101
  ([as, bs = []]) => [unshift(as, bs)],
102
102
  [2 | Backtrack.bracket]),
103
- ]));
103
+ ])));
@@ -5,9 +5,9 @@ import { invalid } from '../util';
5
5
  import { html } from 'typed-dom/dom';
6
6
 
7
7
  export const code: CodeParser = open(
8
- /^(?=`)/,
8
+ /(?=`)/y,
9
9
  match(
10
- /^(`+)(?!`)([^\n]*?)(?:((?<!`)\1(?!`))|(?=$|\n))/,
10
+ /(`+)(?!`)([^\n]*?)(?:((?<!`)\1(?!`))|(?=$|\n))/y,
11
11
  ([whole, opener, body, closer]) => () =>
12
12
  closer
13
13
  ? [[html('code', { 'data-src': whole }, format(body))]]
@@ -23,12 +23,12 @@ describe('Unit: parser/inline/deletion', () => {
23
23
  assert.deepStrictEqual(inspect(parser('~~ ~~'), ctx), [['<del> </del>'], '']);
24
24
  assert.deepStrictEqual(inspect(parser('~~ a~~'), ctx), [['<del> a</del>'], '']);
25
25
  assert.deepStrictEqual(inspect(parser('~~ a ~~'), ctx), [['<del> a </del>'], '']);
26
- assert.deepStrictEqual(inspect(parser('~~ a ~~'), ctx), [['<del> a </del>'], '']);
26
+ assert.deepStrictEqual(inspect(parser('~~ a ~~'), ctx), [['<del> a </del>'], '']);
27
27
  assert.deepStrictEqual(inspect(parser('~~\na~~'), ctx), [['<del><br>a</del>'], '']);
28
28
  assert.deepStrictEqual(inspect(parser('~~\\\na~~'), ctx), [['<del><br>a</del>'], '']);
29
29
  assert.deepStrictEqual(inspect(parser('~~<wbr>a~~'), ctx), [['<del><wbr>a</del>'], '']);
30
30
  assert.deepStrictEqual(inspect(parser('~~a ~~'), ctx), [['<del>a </del>'], '']);
31
- assert.deepStrictEqual(inspect(parser('~~a \n ~~'), ctx), [['<del>a </del>'], '']);
31
+ assert.deepStrictEqual(inspect(parser('~~a \n ~~'), ctx), [['<del>a </del>'], '']);
32
32
  assert.deepStrictEqual(inspect(parser('~~a\n~~'), ctx), [['<del>a</del>'], '']);
33
33
  assert.deepStrictEqual(inspect(parser('~~a\n ~~'), ctx), [['<del>a </del>'], '']);
34
34
  assert.deepStrictEqual(inspect(parser('~~a\n<wbr>~~'), ctx), [['<del>a<wbr></del>'], '']);
@@ -13,7 +13,7 @@ export const deletion: DeletionParser = lazy(() => validate('~~',
13
13
  recursion(Recursion.inline,
14
14
  some(union([
15
15
  some(inline, blankWith('\n', '~~')),
16
- open('\n', some(deletion, '~'), true),
16
+ open('\n', some(inline, '~'), true),
17
17
  ]))),
18
18
  '~~', false,
19
19
  ([, bs], { buffer }) => [push(buffer!, bs)],
@@ -11,11 +11,11 @@ describe('Unit: parser/inline/emphasis', () => {
11
11
  it('invalid', () => {
12
12
  assert.deepStrictEqual(inspect(parser('*'), ctx), undefined);
13
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*']);
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', '<br>', '*'], '']);
17
+ assert.deepStrictEqual(inspect(parser('*a\\ *'), ctx), [['*', 'a', ' ', '*'], '']);
18
+ assert.deepStrictEqual(inspect(parser('*a\\\n*'), ctx), [['*', 'a', '<br>', '*'], '']);
19
19
  assert.deepStrictEqual(inspect(parser('*a**b'), ctx), [['*', 'a', '**', 'b'], '']);
20
20
  assert.deepStrictEqual(inspect(parser('* *'), ctx), undefined);
21
21
  assert.deepStrictEqual(inspect(parser('* a*'), ctx), undefined);
@@ -2,7 +2,6 @@ import { EmphasisParser } from '../inline';
2
2
  import { Recursion } from '../context';
3
3
  import { union, some, recursion, precedence, surround, open, lazy } from '../../combinator';
4
4
  import { inline } from '../inline';
5
- import { emstrong } from './emstrong';
6
5
  import { strong } from './strong';
7
6
  import { str } from '../source';
8
7
  import { tightStart, blankWith } from '../visibility';
@@ -10,16 +9,12 @@ import { unshift } from 'spica/array';
10
9
  import { html, defrag } from 'typed-dom/dom';
11
10
 
12
11
  export const emphasis: EmphasisParser = lazy(() => surround(
13
- str('*', '*'),
12
+ str(/\*(?!\*)/y),
14
13
  precedence(0, recursion(Recursion.inline,
15
14
  tightStart(some(union([
16
15
  strong,
17
16
  some(inline, blankWith('*')),
18
- open(some(inline, '*'), union([
19
- emstrong,
20
- strong,
21
- emphasis,
22
- ])),
17
+ open(some(inline, '*'), inline),
23
18
  ]))))),
24
19
  str('*'), false,
25
20
  ([, bs]) => [[html('em', defrag(bs))]],
@@ -11,11 +11,11 @@ describe('Unit: parser/inline/emstrong', () => {
11
11
  it('invalid', () => {
12
12
  assert.deepStrictEqual(inspect(parser('***'), ctx), undefined);
13
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***']);
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', '<br>', '***'], '']);
17
+ assert.deepStrictEqual(inspect(parser('***a\\ ***'), ctx), [['***', 'a', ' ', '***'], '']);
18
+ assert.deepStrictEqual(inspect(parser('***a\\\n***'), ctx), [['***', 'a', '<br>', '***'], '']);
19
19
  assert.deepStrictEqual(inspect(parser('*** ***'), ctx), undefined);
20
20
  assert.deepStrictEqual(inspect(parser('*** a***'), ctx), undefined);
21
21
  assert.deepStrictEqual(inspect(parser('*** a ***'), ctx), undefined);
@@ -66,8 +66,8 @@ describe('Unit: parser/inline/emstrong', () => {
66
66
  assert.deepStrictEqual(inspect(parser('***a*\\ **b****'), ctx), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
67
67
  assert.deepStrictEqual(inspect(parser('***a*&Tab;**b****'), ctx), [['<strong><em>a</em>\t<strong>b</strong></strong>'], '']);
68
68
  assert.deepStrictEqual(inspect(parser('***a*<wbr>**b****'), ctx), [['<strong><em>a</em><wbr><strong>b</strong></strong>'], '']);
69
- assert.deepStrictEqual(inspect(parser('***a*b **'), ctx), [['**', '<em>a</em>', 'b'], ' **']);
70
- assert.deepStrictEqual(inspect(parser('***a*b\\ **'), ctx), [['**', '<em>a</em>', 'b'], '\\ **']);
69
+ assert.deepStrictEqual(inspect(parser('***a*b **'), ctx), [['**', '<em>a</em>', 'b **'], '']);
70
+ assert.deepStrictEqual(inspect(parser('***a*b\\ **'), ctx), [['**', '<em>a</em>', 'b **'], '']);
71
71
  assert.deepStrictEqual(inspect(parser('***a**b*'), ctx), [['<em><strong>a</strong>b</em>'], '']);
72
72
  assert.deepStrictEqual(inspect(parser('***a**b*c'), ctx), [['<em><strong>a</strong>b</em>'], 'c']);
73
73
  assert.deepStrictEqual(inspect(parser('***a**b*c**'), ctx), [['<em><strong>a</strong>b</em>'], 'c**']);
@@ -77,8 +77,8 @@ describe('Unit: parser/inline/emstrong', () => {
77
77
  assert.deepStrictEqual(inspect(parser('***a**\\ *b**'), ctx), [['<em><strong>a</strong> <em>b</em></em>'], '']);
78
78
  assert.deepStrictEqual(inspect(parser('***a**&Tab;*b**'), ctx), [['<em><strong>a</strong>\t<em>b</em></em>'], '']);
79
79
  assert.deepStrictEqual(inspect(parser('***a**<wbr>*b**'), ctx), [['<em><strong>a</strong><wbr><em>b</em></em>'], '']);
80
- assert.deepStrictEqual(inspect(parser('***a**b *'), ctx), [['*', '<strong>a</strong>', 'b'], ' *']);
81
- assert.deepStrictEqual(inspect(parser('***a**b\\ *'), ctx), [['*', '<strong>a</strong>', 'b'], '\\ *']);
80
+ assert.deepStrictEqual(inspect(parser('***a**b *'), ctx), [['*', '<strong>a</strong>', 'b *'], '']);
81
+ assert.deepStrictEqual(inspect(parser('***a**b\\ *'), ctx), [['*', '<strong>a</strong>', 'b *'], '']);
82
82
  assert.deepStrictEqual(inspect(parser('***a*'), ctx), [['**', '<em>a</em>'], '']);
83
83
  assert.deepStrictEqual(inspect(parser('***a**'), ctx), [['*', '<strong>a</strong>'], '']);
84
84
  assert.deepStrictEqual(inspect(parser('***a***'), ctx), [['<em><strong>a</strong></em>'], '']);
@@ -109,11 +109,11 @@ describe('Unit: parser/inline/emstrong', () => {
109
109
  assert.deepStrictEqual(inspect(parser('******a******'), ctx), [['<em><strong><em><strong>a</strong></em></strong></em>'], '']);
110
110
  assert.deepStrictEqual(inspect(parser('******a******b'), ctx), [['<em><strong><em><strong>a</strong></em></strong></em>'], 'b']);
111
111
  assert.deepStrictEqual(inspect(parser('******a*b'), ctx), [['***', '**', '<em>a</em>', 'b'], '']);
112
- assert.deepStrictEqual(inspect(parser('******a*b *'), ctx), [['***', '**', '<em>a</em>', 'b'], ' *']);
113
- assert.deepStrictEqual(inspect(parser('******a*b **'), ctx), [['***', '**', '<em>a</em>', 'b'], ' **']);
114
- assert.deepStrictEqual(inspect(parser('******a*b ***'), ctx), [['***', '**', '<em>a</em>', 'b'], ' ***']);
115
- assert.deepStrictEqual(inspect(parser('******a*b ****'), ctx), [['***', '**', '<em>a</em>', 'b'], ' ****']);
116
- assert.deepStrictEqual(inspect(parser('******a*b *****'), ctx), [['***', '**', '<em>a</em>', 'b'], ' *****']);
112
+ assert.deepStrictEqual(inspect(parser('******a*b *'), ctx), [['***', '**', '<em>a</em>', 'b *'], '']);
113
+ assert.deepStrictEqual(inspect(parser('******a*b **'), ctx), [['***', '**', '<em>a</em>', 'b **'], '']);
114
+ assert.deepStrictEqual(inspect(parser('******a*b ***'), ctx), [['***', '**', '<em>a</em>', 'b ***'], '']);
115
+ assert.deepStrictEqual(inspect(parser('******a*b ****'), ctx), [['***', '**', '<em>a</em>', 'b ****'], '']);
116
+ assert.deepStrictEqual(inspect(parser('******a*b *****'), ctx), [['***', '**', '<em>a</em>', 'b *****'], '']);
117
117
  });
118
118
 
119
119
  });
@@ -14,20 +14,12 @@ import { html, defrag } from 'typed-dom/dom';
14
14
  const substrong: IntermediateParser<StrongParser> = lazy(() => some(union([
15
15
  emphasis,
16
16
  some(inline, blankWith('*')),
17
- open(some(inline, '*'), union([
18
- emstrong,
19
- strong,
20
- emphasis,
21
- ])),
17
+ open(some(inline, '*'), inline),
22
18
  ])));
23
19
  const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
24
20
  strong,
25
21
  some(inline, blankWith('*')),
26
- open(some(inline, '*'), union([
27
- emstrong,
28
- strong,
29
- emphasis,
30
- ])),
22
+ open(some(inline, '*'), inline),
31
23
  ])));
32
24
 
33
25
  // 開閉が明示的でない構文は開閉の不明確な記号による再帰的適用を行わず
@@ -39,13 +31,9 @@ export const emstrong: EmStrongParser = lazy(() => validate('***',
39
31
  recursion(Recursion.inline,
40
32
  tightStart(some(union([
41
33
  some(inline, blankWith('*')),
42
- open(some(inline, '*'), union([
43
- emstrong,
44
- strong,
45
- emphasis,
46
- ])),
34
+ open(some(inline, '*'), inline),
47
35
  ])))),
48
- str(/^\*{1,3}/), false,
36
+ str(/\*{1,3}/y), false,
49
37
  ([, bs, cs], context): Result<Node<EmStrongParser>, Context<EmStrongParser>> => {
50
38
  assert(cs.length === 1);
51
39
  const { buffer } = context;
@@ -52,7 +52,7 @@ describe('Unit: parser/inline/extension/index', () => {
52
52
  assert.deepStrictEqual(inspect(parser('[#a [% b %]]'), ctx), [['<a class="index" href="#index::a">a <span class="remark"><input type="checkbox"><span>[% b %]</span></span></a>'], '']);
53
53
  assert.deepStrictEqual(inspect(parser('[#a\\ ]'), ctx), [['<a class="index" href="#index::a">a</a>'], '']);
54
54
  assert.deepStrictEqual(inspect(parser('[#a b]'), ctx), [['<a class="index" href="#index::a_b">a b</a>'], '']);
55
- assert.deepStrictEqual(inspect(parser('[#a b]'), ctx), [['<a class="index" href="#index::a__b">a b</a>'], '']);
55
+ assert.deepStrictEqual(inspect(parser('[#a b]'), ctx), [['<a class="index" href="#index::a_b">a b</a>'], '']);
56
56
  assert.deepStrictEqual(inspect(parser('[#a\tb]'), ctx), [['<a class="index" href="#index::a_b=33Mw2l">a\tb</a>'], '']);
57
57
  assert.deepStrictEqual(inspect(parser('[#a_b]'), ctx), [['<a class="index" href="#index::a_b=2H8oCG">a_b</a>'], '']);
58
58
  assert.deepStrictEqual(inspect(parser('[#a\\ b]'), ctx), [['<a class="index" href="#index::a_b">a b</a>'], '']);
@@ -70,7 +70,7 @@ describe('Unit: parser/inline/extension/index', () => {
70
70
  assert.deepStrictEqual(inspect(parser('[#@a]'), ctx), [['<a class="index" href="#index::@a">@a</a>'], '']);
71
71
  assert.deepStrictEqual(inspect(parser('[#http://host]'), ctx), [['<a class="index" href="#index::http://host">http://host</a>'], '']);
72
72
  assert.deepStrictEqual(inspect(parser('[#!http://host]'), ctx), [['<a class="index" href="#index::!http://host">!http://host</a>'], '']);
73
- assert.deepStrictEqual(inspect(parser('[#[% %]]'), ctx), [['<a class="index"><span class="remark"><input type="checkbox"><span>[% %]</span></span></a>'], '']);
73
+ assert.deepStrictEqual(inspect(parser('[#[% %]]'), ctx), [['<a class="index"><span class="remark"><input type="checkbox"><span>[% %]</span></span></a>'], '']);
74
74
  assert.deepStrictEqual(inspect(parser('[#[% a %]]'), ctx), [['<a class="index"><span class="remark"><input type="checkbox"><span>[% a %]</span></span></a>'], '']);
75
75
  assert.deepStrictEqual(inspect(parser('[#a((b))]'), ctx), [['<a class="index" href="#index::a((b))">a<span class="paren">((b))</span></a>'], '']);
76
76
  assert.deepStrictEqual(inspect(parser('[#a[[b]]]'), ctx), [['<a class="index" href="#index::a[[b]]">a[[b]]</a>'], '']);
@@ -89,10 +89,12 @@ describe('Unit: parser/inline/extension/index', () => {
89
89
  assert.deepStrictEqual(inspect(parser('[#a|*b*]'), ctx), [['<a class="index" href="#index::*b*">a<span class="indexer" data-index="*b*"></span></a>'], '']);
90
90
  assert.deepStrictEqual(inspect(parser('[#a|*]*]'), ctx), [['<a class="index" href="#index::*">a<span class="indexer" data-index="*"></span></a>'], '*]']);
91
91
  assert.deepStrictEqual(inspect(parser('[#a|b c]'), ctx), [['<a class="index" href="#index::b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
92
- assert.deepStrictEqual(inspect(parser('[#a|b c]'), ctx), [['<a class="index" href="#index::b__c">a<span class="indexer" data-index="b__c"></span></a>'], '']);
92
+ assert.deepStrictEqual(inspect(parser('[#a|b c]'), ctx), [['<a class="index" href="#index::b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
93
93
  assert.deepStrictEqual(inspect(parser('[#a|b\tc]'), ctx), [['<a class="index" href="#index::b_c=xeqYk">a<span class="indexer" data-index="b_c=xeqYk"></span></a>'], '']);
94
94
  assert.deepStrictEqual(inspect(parser('[#a|b_c]'), ctx), [['<a class="index" href="#index::b_c=KUxv5">a<span class="indexer" data-index="b_c=KUxv5"></span></a>'], '']);
95
95
  assert.deepStrictEqual(inspect(parser('[#a|\\[\\]]'), ctx), [['<a class="index" href="#index::[]">a<span class="indexer" data-index="[]"></span></a>'], '']);
96
+ assert.deepStrictEqual(inspect(parser('[#a|&]'), ctx), [['<a class="index" href="#index::&amp;">a<span class="indexer" data-index="&amp;"></span></a>'], '']);
97
+ assert.deepStrictEqual(inspect(parser('[#a|&copy]'), ctx), [['<a class="index" href="#index::&amp;copy">a<span class="indexer" data-index="&amp;copy"></span></a>'], '']);
96
98
  assert.deepStrictEqual(inspect(parser('[#a|&copy;]'), ctx), [['<a class="index" href="#index::©">a<span class="indexer" data-index="©"></span></a>'], '']);
97
99
  assert.deepStrictEqual(inspect(parser('[#a|&nbsp;]'), ctx), [['<a class="index" href="#index::a|">a|</a>'], '']);
98
100
  assert.deepStrictEqual(inspect(parser('[#a|<wbr>]'), ctx), [['<a class="index" href="#index::a|">a|</a>'], '']);