securemark 0.259.0 → 0.260.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 (152) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/design.md +16 -5
  3. package/dist/index.js +625 -318
  4. package/package.json +1 -1
  5. package/src/combinator/control/constraint/block.test.ts +5 -5
  6. package/src/combinator/control/constraint/block.ts +2 -2
  7. package/src/combinator/control/constraint/contract.ts +4 -4
  8. package/src/combinator/control/constraint/line.test.ts +6 -6
  9. package/src/combinator/control/constraint/line.ts +5 -5
  10. package/src/combinator/control/manipulation/convert.ts +5 -5
  11. package/src/combinator/control/manipulation/fence.ts +1 -1
  12. package/src/combinator/control/manipulation/indent.test.ts +14 -14
  13. package/src/combinator/control/manipulation/indent.ts +5 -5
  14. package/src/combinator/control/manipulation/lazy.ts +2 -2
  15. package/src/combinator/control/manipulation/match.ts +2 -2
  16. package/src/combinator/control/manipulation/recovery.ts +6 -6
  17. package/src/combinator/control/manipulation/scope.ts +11 -10
  18. package/src/combinator/control/manipulation/surround.ts +9 -8
  19. package/src/combinator/control/manipulation/trim.test.ts +9 -9
  20. package/src/combinator/control/monad/bind.ts +2 -2
  21. package/src/combinator/data/parser/context/memo.ts +3 -4
  22. package/src/combinator/data/parser/context.test.ts +9 -9
  23. package/src/combinator/data/parser/context.ts +33 -33
  24. package/src/combinator/data/parser/inits.ts +2 -2
  25. package/src/combinator/data/parser/sequence.test.ts +10 -10
  26. package/src/combinator/data/parser/sequence.ts +2 -2
  27. package/src/combinator/data/parser/some.test.ts +13 -13
  28. package/src/combinator/data/parser/some.ts +2 -2
  29. package/src/combinator/data/parser/subsequence.test.ts +14 -14
  30. package/src/combinator/data/parser/union.test.ts +10 -10
  31. package/src/combinator/data/parser/union.ts +2 -2
  32. package/src/combinator/data/parser.ts +6 -1
  33. package/src/parser/api/bind.ts +3 -3
  34. package/src/parser/api/header.ts +1 -1
  35. package/src/parser/api/normalize.ts +1 -1
  36. package/src/parser/api/parse.test.ts +19 -19
  37. package/src/parser/api/parse.ts +3 -3
  38. package/src/parser/autolink.test.ts +7 -7
  39. package/src/parser/autolink.ts +2 -2
  40. package/src/parser/block/blockquote.test.ts +9 -9
  41. package/src/parser/block/blockquote.ts +1 -1
  42. package/src/parser/block/codeblock.test.ts +5 -5
  43. package/src/parser/block/codeblock.ts +1 -1
  44. package/src/parser/block/dlist.test.ts +2 -2
  45. package/src/parser/block/extension/aside.test.ts +1 -1
  46. package/src/parser/block/extension/example.test.ts +1 -1
  47. package/src/parser/block/extension/example.ts +1 -1
  48. package/src/parser/block/extension/fig.test.ts +1 -1
  49. package/src/parser/block/extension/figbase.test.ts +1 -1
  50. package/src/parser/block/extension/figure.test.ts +2 -2
  51. package/src/parser/block/extension/figure.ts +1 -1
  52. package/src/parser/block/extension/message.test.ts +1 -1
  53. package/src/parser/block/extension/message.ts +1 -1
  54. package/src/parser/block/extension/placeholder.test.ts +1 -1
  55. package/src/parser/block/extension/table.test.ts +1 -1
  56. package/src/parser/block/extension/table.ts +1 -1
  57. package/src/parser/block/extension.test.ts +1 -1
  58. package/src/parser/block/heading.test.ts +8 -8
  59. package/src/parser/block/heading.ts +1 -1
  60. package/src/parser/block/horizontalrule.test.ts +1 -1
  61. package/src/parser/block/ilist.test.ts +1 -1
  62. package/src/parser/block/mathblock.test.ts +1 -1
  63. package/src/parser/block/olist.test.ts +2 -2
  64. package/src/parser/block/olist.ts +5 -5
  65. package/src/parser/block/paragraph.test.ts +15 -15
  66. package/src/parser/block/reply/cite.test.ts +12 -12
  67. package/src/parser/block/reply/cite.ts +2 -2
  68. package/src/parser/block/reply/quote.test.ts +4 -4
  69. package/src/parser/block/reply/quote.ts +2 -2
  70. package/src/parser/block/reply.test.ts +9 -9
  71. package/src/parser/block/sidefence.test.ts +7 -7
  72. package/src/parser/block/table.test.ts +1 -1
  73. package/src/parser/block/table.ts +1 -1
  74. package/src/parser/block/ulist.test.ts +2 -2
  75. package/src/parser/block/ulist.ts +1 -1
  76. package/src/parser/block.ts +2 -2
  77. package/src/parser/context.ts +23 -13
  78. package/src/parser/header.test.ts +1 -1
  79. package/src/parser/header.ts +3 -3
  80. package/src/parser/inline/annotation.test.ts +4 -4
  81. package/src/parser/inline/annotation.ts +3 -4
  82. package/src/parser/inline/autolink/account.test.ts +12 -12
  83. package/src/parser/inline/autolink/account.ts +4 -2
  84. package/src/parser/inline/autolink/anchor.test.ts +10 -10
  85. package/src/parser/inline/autolink/anchor.ts +14 -11
  86. package/src/parser/inline/autolink/channel.test.ts +4 -4
  87. package/src/parser/inline/autolink/email.test.ts +1 -1
  88. package/src/parser/inline/autolink/email.ts +1 -1
  89. package/src/parser/inline/autolink/hashnum.test.ts +1 -1
  90. package/src/parser/inline/autolink/hashnum.ts +4 -2
  91. package/src/parser/inline/autolink/hashtag.test.ts +21 -21
  92. package/src/parser/inline/autolink/hashtag.ts +4 -2
  93. package/src/parser/inline/autolink/url.test.ts +56 -56
  94. package/src/parser/inline/autolink/url.ts +5 -3
  95. package/src/parser/inline/autolink.ts +1 -1
  96. package/src/parser/inline/bracket.test.ts +1 -1
  97. package/src/parser/inline/bracket.ts +8 -8
  98. package/src/parser/inline/code.test.ts +1 -1
  99. package/src/parser/inline/code.ts +2 -2
  100. package/src/parser/inline/comment.test.ts +1 -1
  101. package/src/parser/inline/comment.ts +2 -2
  102. package/src/parser/inline/deletion.test.ts +1 -1
  103. package/src/parser/inline/deletion.ts +2 -2
  104. package/src/parser/inline/emphasis.test.ts +1 -1
  105. package/src/parser/inline/emphasis.ts +2 -2
  106. package/src/parser/inline/emstrong.ts +4 -4
  107. package/src/parser/inline/escape.ts +3 -3
  108. package/src/parser/inline/extension/index.test.ts +1 -1
  109. package/src/parser/inline/extension/index.ts +3 -4
  110. package/src/parser/inline/extension/indexer.test.ts +1 -1
  111. package/src/parser/inline/extension/label.test.ts +1 -1
  112. package/src/parser/inline/extension/placeholder.test.ts +1 -1
  113. package/src/parser/inline/extension/placeholder.ts +2 -2
  114. package/src/parser/inline/html.test.ts +1 -3
  115. package/src/parser/inline/html.ts +3 -3
  116. package/src/parser/inline/htmlentity.test.ts +1 -1
  117. package/src/parser/inline/htmlentity.ts +1 -1
  118. package/src/parser/inline/insertion.test.ts +1 -1
  119. package/src/parser/inline/insertion.ts +2 -2
  120. package/src/parser/inline/link.test.ts +111 -111
  121. package/src/parser/inline/link.ts +12 -12
  122. package/src/parser/inline/mark.test.ts +1 -1
  123. package/src/parser/inline/mark.ts +2 -2
  124. package/src/parser/inline/math.test.ts +1 -1
  125. package/src/parser/inline/math.ts +1 -1
  126. package/src/parser/inline/media.test.ts +2 -1
  127. package/src/parser/inline/media.ts +4 -4
  128. package/src/parser/inline/reference.test.ts +4 -4
  129. package/src/parser/inline/reference.ts +3 -4
  130. package/src/parser/inline/ruby.test.ts +1 -1
  131. package/src/parser/inline/ruby.ts +5 -5
  132. package/src/parser/inline/shortmedia.test.ts +1 -1
  133. package/src/parser/inline/strong.test.ts +1 -1
  134. package/src/parser/inline/strong.ts +2 -2
  135. package/src/parser/inline/template.test.ts +1 -1
  136. package/src/parser/inline/template.ts +2 -2
  137. package/src/parser/inline.test.ts +52 -52
  138. package/src/parser/locale.test.ts +1 -1
  139. package/src/parser/segment.ts +1 -1
  140. package/src/parser/source/escapable.test.ts +1 -1
  141. package/src/parser/source/escapable.ts +1 -1
  142. package/src/parser/source/line.test.ts +1 -1
  143. package/src/parser/source/line.ts +2 -2
  144. package/src/parser/source/str.ts +4 -4
  145. package/src/parser/source/text.test.ts +1 -1
  146. package/src/parser/source/text.ts +4 -4
  147. package/src/parser/source/unescapable.test.ts +1 -1
  148. package/src/parser/source/unescapable.ts +1 -1
  149. package/src/parser/visibility.ts +13 -13
  150. package/src/renderer/render/media/pdf.ts +1 -0
  151. package/src/util/info.ts +2 -4
  152. package/src/util/quote.ts +1 -1
@@ -5,18 +5,18 @@ import { MarkdownParser } from '../../../markdown';
5
5
 
6
6
  describe('Unit: parser/inline/link', () => {
7
7
  describe('link', () => {
8
- const parser = (source: string, context: MarkdownParser.Context = {}) => some(link)(source, context);
8
+ const parser = (source: string, context: MarkdownParser.Context = {}) => some(link)({ source, context });
9
9
 
10
10
  it('xss', () => {
11
11
  assert.deepStrictEqual(inspect(parser('[]{javascript:alert}')), [['<a class="invalid">javascript:alert</a>'], '']);
12
12
  assert.deepStrictEqual(inspect(parser('[]{vbscript:alert}')), [['<a class="invalid">vbscript:alert</a>'], '']);
13
13
  assert.deepStrictEqual(inspect(parser('[]{data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K}')), [['<a class="invalid">data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K</a>'], '']);
14
14
  assert.deepStrictEqual(inspect(parser('[]{any:alert}')), [['<a class="invalid">any:alert</a>'], '']);
15
- assert.deepStrictEqual(inspect(parser('[]{"}')), [['<a href="&quot;">"</a>'], '']);
16
- assert.deepStrictEqual(inspect(parser('[]{<}')), [['<a href="<">&lt;</a>'], '']);
17
- assert.deepStrictEqual(inspect(parser('[]{\\}')), [['<a href="\\">\\</a>'], '']);
18
- assert.deepStrictEqual(inspect(parser('[]{\\"}')), [['<a href="\\&quot;">\\"</a>'], '']);
19
- assert.deepStrictEqual(inspect(parser('[]{\\<}')), [['<a href="\\<">\\&lt;</a>'], '']);
15
+ assert.deepStrictEqual(inspect(parser('[]{"}')), [['<a class="link" href="&quot;">"</a>'], '']);
16
+ assert.deepStrictEqual(inspect(parser('[]{<}')), [['<a class="link" href="<">&lt;</a>'], '']);
17
+ assert.deepStrictEqual(inspect(parser('[]{\\}')), [['<a class="link" href="\\">\\</a>'], '']);
18
+ assert.deepStrictEqual(inspect(parser('[]{\\"}')), [['<a class="link" href="\\&quot;">\\"</a>'], '']);
19
+ assert.deepStrictEqual(inspect(parser('[]{\\<}')), [['<a class="link" href="\\<">\\&lt;</a>'], '']);
20
20
  });
21
21
 
22
22
  it('fishing', () => {
@@ -30,16 +30,16 @@ describe('Unit: parser/inline/link', () => {
30
30
  assert.deepStrictEqual(inspect(parser('[-1234567890]{tel:1234567890}')), [[`<a class="invalid">-1234567890</a>`], '']);
31
31
  assert.deepStrictEqual(inspect(parser('[123456789a]{tel:1234567890}')), [['<a class="invalid">123456789a</a>'], '']);
32
32
  assert.deepStrictEqual(inspect(parser('[1234567890]{tel:ttel:1234567890}')), [['<a class="invalid">1234567890</a>'], '']);
33
- assert.deepStrictEqual(inspect(parser('[#a]{b}')), undefined);
34
- assert.deepStrictEqual(inspect(parser('[\\#a]{b}')), undefined);
35
- assert.deepStrictEqual(inspect(parser('[c #a]{b}')), undefined);
36
- assert.deepStrictEqual(inspect(parser('[c \\#a]{b}')), undefined);
37
- assert.deepStrictEqual(inspect(parser('[]{#a}')), [['<a href="#a">#a</a>'], '']);
38
- assert.deepStrictEqual(inspect(parser('[@a]{b}')), undefined);
39
- assert.deepStrictEqual(inspect(parser('[\\@a]{b}')), undefined);
40
- assert.deepStrictEqual(inspect(parser('[c @a]{b}')), undefined);
41
- assert.deepStrictEqual(inspect(parser('[c \\@a]{b}')), undefined);
42
- assert.deepStrictEqual(inspect(parser('[]{@a}')), [['<a href="@a">@a</a>'], '']);
33
+ //assert.deepStrictEqual(inspect(parser('[#a]{b}')), undefined);
34
+ //assert.deepStrictEqual(inspect(parser('[\\#a]{b}')), undefined);
35
+ //assert.deepStrictEqual(inspect(parser('[c #a]{b}')), undefined);
36
+ //assert.deepStrictEqual(inspect(parser('[c \\#a]{b}')), undefined);
37
+ //assert.deepStrictEqual(inspect(parser('[]{#a}')), [['<a class="link" href="#a">#a</a>'], '']);
38
+ //assert.deepStrictEqual(inspect(parser('[@a]{b}')), undefined);
39
+ //assert.deepStrictEqual(inspect(parser('[\\@a]{b}')), undefined);
40
+ //assert.deepStrictEqual(inspect(parser('[c @a]{b}')), undefined);
41
+ //assert.deepStrictEqual(inspect(parser('[c \\@a]{b}')), undefined);
42
+ //assert.deepStrictEqual(inspect(parser('[]{@a}')), [['<a class="link" href="@a">@a</a>'], '']);
43
43
  });
44
44
 
45
45
  it('invalid', () => {
@@ -87,120 +87,120 @@ describe('Unit: parser/inline/link', () => {
87
87
  });
88
88
 
89
89
  it('basic', () => {
90
- assert.deepStrictEqual(inspect(parser('[]{b}')), [['<a href="b">b</a>'], '']);
91
- assert.deepStrictEqual(inspect(parser('[]{b }')), [['<a href="b">b</a>'], '']);
92
- assert.deepStrictEqual(inspect(parser('[]{b }')), [['<a href="b">b</a>'], '']);
93
- assert.deepStrictEqual(inspect(parser('[]{ b }')), [['<a href="b">b</a>'], '']);
94
- assert.deepStrictEqual(inspect(parser('[]{ b }')), [['<a href="b">b</a>'], '']);
95
- assert.deepStrictEqual(inspect(parser('[]{ b }')), [['<a href="b">b</a>'], '']);
96
- assert.deepStrictEqual(inspect(parser('[]{ b }')), [['<a href="b">b</a>'], '']);
97
- assert.deepStrictEqual(inspect(parser('[]{ b }')), [['<a href="b">b</a>'], '']);
98
- assert.deepStrictEqual(inspect(parser('[]{\\}')), [[`<a href="\\">\\</a>`], '']);
99
- assert.deepStrictEqual(inspect(parser('[]{\\ }')), [[`<a href="\\">\\</a>`], '']);
100
- assert.deepStrictEqual(inspect(parser('[]{\\b}')), [[`<a href="\\b">\\b</a>`], '']);
101
- assert.deepStrictEqual(inspect(parser('[]{?b=c+d&\\#}')), [['<a href="?b=c+d&amp;\\#">?b=c+d&amp;\\#</a>'], '']);
102
- assert.deepStrictEqual(inspect(parser('[]{?&copy;}')), [['<a href="?&amp;copy;">?&amp;copy;</a>'], '']);
103
- assert.deepStrictEqual(inspect(parser('[]{#}')), [['<a href="#">#</a>'], '']);
104
- assert.deepStrictEqual(inspect(parser('[]{#b}')), [['<a href="#b">#b</a>'], '']);
105
- assert.deepStrictEqual(inspect(parser('[]{./b}')), [['<a href="./b">./b</a>'], '']);
106
- assert.deepStrictEqual(inspect(parser('[]{^/b}')), [[`<a href="/b">^/b</a>`], '']);
107
- assert.deepStrictEqual(inspect(parser('[]{^/b?/../}')), [[`<a href="/b?/../">^/b?/../</a>`], '']);
108
- assert.deepStrictEqual(inspect(parser('[]{^/b#/../}')), [[`<a href="/b#/../">^/b#/../</a>`], '']);
109
- assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/dir', location.origin) })), [[`<a href="/dir/b">^/b</a>`], '']);
110
- assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/dir/', location.origin) })), [[`<a href="/dir/b">^/b</a>`], '']);
111
- assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/folder/doc.md', location.origin) })), [[`<a href="/folder/b">^/b</a>`], '']);
112
- assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/folder/doc.md/', location.origin) })), [[`<a href="/folder/doc.md/b">^/b</a>`], '']);
113
- assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/.file', location.origin) })), [[`<a href="/b">^/b</a>`], '']);
114
- assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/0.0a', location.origin) })), [[`<a href="/b">^/b</a>`], '']);
115
- assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/0.a0', location.origin) })), [[`<a href="/b">^/b</a>`], '']);
116
- assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/0.0', location.origin) })), [[`<a href="/0.0/b">^/b</a>`], '']);
117
- assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/0.0,0.0,0z', location.origin) })), [[`<a href="/0.0,0.0,0z/b">^/b</a>`], '']);
118
- assert.deepStrictEqual(inspect(parser('[ a]{b}')), [['<a href="b">a</a>'], '']);
119
- assert.deepStrictEqual(inspect(parser('[ a ]{b}')), [['<a href="b">a</a>'], '']);
120
- assert.deepStrictEqual(inspect(parser('[\\ a]{b}')), [['<a href="b">a</a>'], '']);
121
- assert.deepStrictEqual(inspect(parser('[ \\ a]{b}')), [['<a href="b">a</a>'], '']);
122
- assert.deepStrictEqual(inspect(parser('[a ]{b}')), [['<a href="b">a</a>'], '']);
123
- assert.deepStrictEqual(inspect(parser('[a ]{b}')), [['<a href="b">a</a>'], '']);
124
- assert.deepStrictEqual(inspect(parser('[a]{b}')), [['<a href="b">a</a>'], '']);
125
- assert.deepStrictEqual(inspect(parser('[a]{#}')), [['<a href="#">a</a>'], '']);
126
- assert.deepStrictEqual(inspect(parser('[a]{#b}')), [['<a href="#b">a</a>'], '']);
127
- assert.deepStrictEqual(inspect(parser('[a b]{c}')), [['<a href="c">a b</a>'], '']);
128
- assert.deepStrictEqual(inspect(parser(`[]{?#${encodeURIComponent(':/[]{}<>?#=& ')}}`)), [['<a href="?#%3A%2F%5B%5D%7B%7D%3C%3E%3F%23%3D%26%20">?#%3A%2F[]{}&lt;&gt;%3F%23%3D%26%20</a>'], '']);
129
- assert.deepStrictEqual(inspect(parser('{b}')), [['<a href="b">b</a>'], '']);
130
- assert.deepStrictEqual(inspect(parser('{ ][ }')), [['<a href="][">][</a>'], '']);
131
- assert.deepStrictEqual(inspect(parser('{ }{ }')), [['<a href="}{">}{</a>'], '']);
132
- assert.deepStrictEqual(inspect(parser('{Http://host}')), [['<a href="Http://host" target="_blank">Http://host</a>'], '']);
90
+ assert.deepStrictEqual(inspect(parser('[]{b}')), [['<a class="link" href="b">b</a>'], '']);
91
+ assert.deepStrictEqual(inspect(parser('[]{b }')), [['<a class="link" href="b">b</a>'], '']);
92
+ assert.deepStrictEqual(inspect(parser('[]{b }')), [['<a class="link" href="b">b</a>'], '']);
93
+ assert.deepStrictEqual(inspect(parser('[]{ b }')), [['<a class="link" href="b">b</a>'], '']);
94
+ assert.deepStrictEqual(inspect(parser('[]{ b }')), [['<a class="link" href="b">b</a>'], '']);
95
+ assert.deepStrictEqual(inspect(parser('[]{ b }')), [['<a class="link" href="b">b</a>'], '']);
96
+ assert.deepStrictEqual(inspect(parser('[]{ b }')), [['<a class="link" href="b">b</a>'], '']);
97
+ assert.deepStrictEqual(inspect(parser('[]{ b }')), [['<a class="link" href="b">b</a>'], '']);
98
+ assert.deepStrictEqual(inspect(parser('[]{\\}')), [[`<a class="link" href="\\">\\</a>`], '']);
99
+ assert.deepStrictEqual(inspect(parser('[]{\\ }')), [[`<a class="link" href="\\">\\</a>`], '']);
100
+ assert.deepStrictEqual(inspect(parser('[]{\\b}')), [[`<a class="link" href="\\b">\\b</a>`], '']);
101
+ assert.deepStrictEqual(inspect(parser('[]{?b=c+d&\\#}')), [['<a class="link" href="?b=c+d&amp;\\#">?b=c+d&amp;\\#</a>'], '']);
102
+ assert.deepStrictEqual(inspect(parser('[]{?&copy;}')), [['<a class="link" href="?&amp;copy;">?&amp;copy;</a>'], '']);
103
+ assert.deepStrictEqual(inspect(parser('[]{#}')), [['<a class="link" href="#">#</a>'], '']);
104
+ assert.deepStrictEqual(inspect(parser('[]{#b}')), [['<a class="link" href="#b">#b</a>'], '']);
105
+ assert.deepStrictEqual(inspect(parser('[]{./b}')), [['<a class="link" href="./b">./b</a>'], '']);
106
+ assert.deepStrictEqual(inspect(parser('[]{^/b}')), [[`<a class="link" href="/b">^/b</a>`], '']);
107
+ assert.deepStrictEqual(inspect(parser('[]{^/b?/../}')), [[`<a class="link" href="/b?/../">^/b?/../</a>`], '']);
108
+ assert.deepStrictEqual(inspect(parser('[]{^/b#/../}')), [[`<a class="link" href="/b#/../">^/b#/../</a>`], '']);
109
+ assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/dir', location.origin) })), [[`<a class="link" href="/dir/b">^/b</a>`], '']);
110
+ assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/dir/', location.origin) })), [[`<a class="link" href="/dir/b">^/b</a>`], '']);
111
+ assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/folder/doc.md', location.origin) })), [[`<a class="link" href="/folder/b">^/b</a>`], '']);
112
+ assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/folder/doc.md/', location.origin) })), [[`<a class="link" href="/folder/doc.md/b">^/b</a>`], '']);
113
+ assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/.file', location.origin) })), [[`<a class="link" href="/b">^/b</a>`], '']);
114
+ assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/0.0a', location.origin) })), [[`<a class="link" href="/b">^/b</a>`], '']);
115
+ assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/0.a0', location.origin) })), [[`<a class="link" href="/b">^/b</a>`], '']);
116
+ assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/0.0', location.origin) })), [[`<a class="link" href="/0.0/b">^/b</a>`], '']);
117
+ assert.deepStrictEqual(inspect(parser('[]{^/b}', { host: new URL('/0.0,0.0,0z', location.origin) })), [[`<a class="link" href="/0.0,0.0,0z/b">^/b</a>`], '']);
118
+ assert.deepStrictEqual(inspect(parser('[ a]{b}')), [['<a class="link" href="b">a</a>'], '']);
119
+ assert.deepStrictEqual(inspect(parser('[ a ]{b}')), [['<a class="link" href="b">a</a>'], '']);
120
+ assert.deepStrictEqual(inspect(parser('[\\ a]{b}')), [['<a class="link" href="b">a</a>'], '']);
121
+ assert.deepStrictEqual(inspect(parser('[ \\ a]{b}')), [['<a class="link" href="b">a</a>'], '']);
122
+ assert.deepStrictEqual(inspect(parser('[a ]{b}')), [['<a class="link" href="b">a</a>'], '']);
123
+ assert.deepStrictEqual(inspect(parser('[a ]{b}')), [['<a class="link" href="b">a</a>'], '']);
124
+ assert.deepStrictEqual(inspect(parser('[a]{b}')), [['<a class="link" href="b">a</a>'], '']);
125
+ assert.deepStrictEqual(inspect(parser('[a]{#}')), [['<a class="link" href="#">a</a>'], '']);
126
+ assert.deepStrictEqual(inspect(parser('[a]{#b}')), [['<a class="link" href="#b">a</a>'], '']);
127
+ assert.deepStrictEqual(inspect(parser('[a b]{c}')), [['<a class="link" href="c">a b</a>'], '']);
128
+ assert.deepStrictEqual(inspect(parser(`[]{?#${encodeURIComponent(':/[]{}<>?#=& ')}}`)), [['<a class="link" href="?#%3A%2F%5B%5D%7B%7D%3C%3E%3F%23%3D%26%20">?#%3A%2F[]{}&lt;&gt;%3F%23%3D%26%20</a>'], '']);
129
+ assert.deepStrictEqual(inspect(parser('{b}')), [['<a class="link" href="b">b</a>'], '']);
130
+ assert.deepStrictEqual(inspect(parser('{ ][ }')), [['<a class="link" href="][">][</a>'], '']);
131
+ assert.deepStrictEqual(inspect(parser('{ }{ }')), [['<a class="link" href="}{">}{</a>'], '']);
132
+ assert.deepStrictEqual(inspect(parser('{Http://host}')), [['<a class="link" href="Http://host" target="_blank">Http://host</a>'], '']);
133
133
  });
134
134
 
135
135
  it('tel', () => {
136
- assert.deepStrictEqual(inspect(parser('{tel:1234567890}')), [[`<a href="tel:1234567890">tel:1234567890</a>`], '']);
137
- assert.deepStrictEqual(inspect(parser('{Tel:1234567890}')), [[`<a href="Tel:1234567890">Tel:1234567890</a>`], '']);
138
- assert.deepStrictEqual(inspect(parser('{tel:+1234567890}')), [[`<a href="tel:+1234567890">tel:+1234567890</a>`], '']);
139
- assert.deepStrictEqual(inspect(parser('{tel:+12-345-67-890}')), [[`<a href="tel:+12-345-67-890">tel:+12-345-67-890</a>`], '']);
140
- assert.deepStrictEqual(inspect(parser('[1234567890]{tel:1234567890}')), [[`<a href="tel:1234567890">1234567890</a>`], '']);
141
- assert.deepStrictEqual(inspect(parser('[12-3456-7890]{tel:1234567890}')), [[`<a href="tel:1234567890">12-3456-7890</a>`], '']);
142
- assert.deepStrictEqual(inspect(parser('[+12-34567-890]{tel:+12-345-67890}')), [[`<a href="tel:+12-345-67890">+12-34567-890</a>`], '']);
136
+ assert.deepStrictEqual(inspect(parser('{tel:1234567890}')), [[`<a class="tel" href="tel:1234567890">tel:1234567890</a>`], '']);
137
+ assert.deepStrictEqual(inspect(parser('{Tel:1234567890}')), [[`<a class="tel" href="Tel:1234567890">Tel:1234567890</a>`], '']);
138
+ assert.deepStrictEqual(inspect(parser('{tel:+1234567890}')), [[`<a class="tel" href="tel:+1234567890">tel:+1234567890</a>`], '']);
139
+ assert.deepStrictEqual(inspect(parser('{tel:+12-345-67-890}')), [[`<a class="tel" href="tel:+12-345-67-890">tel:+12-345-67-890</a>`], '']);
140
+ assert.deepStrictEqual(inspect(parser('[1234567890]{tel:1234567890}')), [[`<a class="tel" href="tel:1234567890">1234567890</a>`], '']);
141
+ assert.deepStrictEqual(inspect(parser('[12-3456-7890]{tel:1234567890}')), [[`<a class="tel" href="tel:1234567890">12-3456-7890</a>`], '']);
142
+ assert.deepStrictEqual(inspect(parser('[+12-34567-890]{tel:+12-345-67890}')), [[`<a class="tel" href="tel:+12-345-67890">+12-34567-890</a>`], '']);
143
143
  });
144
144
 
145
145
  it('media', () => {
146
- assert.deepStrictEqual(inspect(parser('[![]{a}]{a}')), [['<a href="a" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
147
- assert.deepStrictEqual(inspect(parser('[![]{a}]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
148
- assert.deepStrictEqual(inspect(parser('[![]{a} ]{b}')), [['<a href="b">![]{a}</a>'], '']);
149
- assert.deepStrictEqual(inspect(parser('[![]{a}![]{a}]{b}')), [['<a href="b">![]{a}![]{a}</a>'], '']);
150
- assert.deepStrictEqual(inspect(parser('[[![]{a}]{b}]{c}')), [['<a href="c">[![]{a}]{b}</a>'], '']);
151
- assert.deepStrictEqual(inspect(parser('[!http://host]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="http://host" alt=""></a>'], '']);
146
+ assert.deepStrictEqual(inspect(parser('[![]{a}]{a}')), [['<a class="link" href="a" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
147
+ assert.deepStrictEqual(inspect(parser('[![]{a}]{b}')), [['<a class="link" href="b" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
148
+ assert.deepStrictEqual(inspect(parser('[![]{a} ]{b}')), [['<a class="link" href="b">![]{a}</a>'], '']);
149
+ assert.deepStrictEqual(inspect(parser('[![]{a}![]{a}]{b}')), [['<a class="link" href="b">![]{a}![]{a}</a>'], '']);
150
+ assert.deepStrictEqual(inspect(parser('[[![]{a}]{b}]{c}')), [['<a class="link" href="c">[![]{a}]{b}</a>'], '']);
151
+ assert.deepStrictEqual(inspect(parser('[!http://host]{b}')), [['<a class="link" href="b" target="_blank"><img class="media" data-src="http://host" alt=""></a>'], '']);
152
152
  });
153
153
 
154
154
  it('nest', () => {
155
- assert.deepStrictEqual(inspect(parser('[*]{/}')), [['<a href="/">*</a>'], '']);
156
- assert.deepStrictEqual(inspect(parser('[\\[]{/}')), [['<a href="/">[</a>'], '']);
157
- assert.deepStrictEqual(inspect(parser('[\\]]{/}')), [['<a href="/">]</a>'], '']);
158
- assert.deepStrictEqual(inspect(parser('[[]{a}]{a}')), [['<a href="a">[]{a}</a>'], '']);
159
- assert.deepStrictEqual(inspect(parser('[[]{a}]{b}')), [['<a href="b">[]{a}</a>'], '']);
160
- assert.deepStrictEqual(inspect(parser('[[![]{a}]{a}]{a}')), [['<a href="a">[![]{a}]{a}</a>'], '']);
161
- assert.deepStrictEqual(inspect(parser('[[![]{a}]{a}]{b}')), [['<a href="b">[![]{a}]{a}</a>'], '']);
162
- assert.deepStrictEqual(inspect(parser('[[![]{a}]{b}]{b}')), [['<a href="b">[![]{a}]{b}</a>'], '']);
163
- assert.deepStrictEqual(inspect(parser('[((a))]{b}')), [['<a href="b"><span class="paren">((a))</span></a>'], '']);
164
- assert.deepStrictEqual(inspect(parser('[[[a]]]{b}')), [['<a href="b">[[a]]</a>'], '']);
165
- assert.deepStrictEqual(inspect(parser('[!http://host]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="http://host" alt=""></a>'], '']);
166
- assert.deepStrictEqual(inspect(parser('[*a*]{b}')), [['<a href="b"><em>a</em></a>'], '']);
155
+ assert.deepStrictEqual(inspect(parser('[*]{/}')), [['<a class="link" href="/">*</a>'], '']);
156
+ assert.deepStrictEqual(inspect(parser('[\\[]{/}')), [['<a class="link" href="/">[</a>'], '']);
157
+ assert.deepStrictEqual(inspect(parser('[\\]]{/}')), [['<a class="link" href="/">]</a>'], '']);
158
+ assert.deepStrictEqual(inspect(parser('[[]{a}]{a}')), [['<a class="link" href="a">[]{a}</a>'], '']);
159
+ assert.deepStrictEqual(inspect(parser('[[]{a}]{b}')), [['<a class="link" href="b">[]{a}</a>'], '']);
160
+ assert.deepStrictEqual(inspect(parser('[[![]{a}]{a}]{a}')), [['<a class="link" href="a">[![]{a}]{a}</a>'], '']);
161
+ assert.deepStrictEqual(inspect(parser('[[![]{a}]{a}]{b}')), [['<a class="link" href="b">[![]{a}]{a}</a>'], '']);
162
+ assert.deepStrictEqual(inspect(parser('[[![]{a}]{b}]{b}')), [['<a class="link" href="b">[![]{a}]{b}</a>'], '']);
163
+ assert.deepStrictEqual(inspect(parser('[((a))]{b}')), [['<a class="link" href="b"><span class="paren">((a))</span></a>'], '']);
164
+ assert.deepStrictEqual(inspect(parser('[[[a]]]{b}')), [['<a class="link" href="b">[[a]]</a>'], '']);
165
+ assert.deepStrictEqual(inspect(parser('[!http://host]{/}')), [['<a class="link" href="/" target="_blank"><img class="media" data-src="http://host" alt=""></a>'], '']);
166
+ assert.deepStrictEqual(inspect(parser('[*a*]{b}')), [['<a class="link" href="b"><em>a</em></a>'], '']);
167
167
  });
168
168
 
169
169
  it('external', () => {
170
- assert.deepStrictEqual(inspect(parser('[]{//host}')), [['<a href="//host" target="_blank">//host</a>'], '']);
171
- assert.deepStrictEqual(inspect(parser('[]{//[::]}')), [['<a href="//[::]" target="_blank">//[::]</a>'], '']);
170
+ assert.deepStrictEqual(inspect(parser('[]{//host}')), [['<a class="link" href="//host" target="_blank">//host</a>'], '']);
171
+ assert.deepStrictEqual(inspect(parser('[]{//[::]}')), [['<a class="link" href="//[::]" target="_blank">//[::]</a>'], '']);
172
172
  });
173
173
 
174
174
  it('attribute', () => {
175
- assert.deepStrictEqual(inspect(parser('[]{/ name=}')), [['<a href="/" class="invalid">/</a>'], '']);
176
- assert.deepStrictEqual(inspect(parser('[]{/ name="}')), [['<a href="/" class="invalid">/</a>'], '']);
177
- assert.deepStrictEqual(inspect(parser('[]{/ name="""}')), [['<a href="/" class="invalid">/</a>'], '']);
178
- assert.deepStrictEqual(inspect(parser('[]{/ name}')), [['<a href="/" class="invalid">/</a>'], '']);
179
- assert.deepStrictEqual(inspect(parser('[]{/ name=""}')), [['<a href="/" class="invalid">/</a>'], '']);
180
- assert.deepStrictEqual(inspect(parser('[]{/ name=" "}')), [['<a href="/" class="invalid">/</a>'], '']);
181
- assert.deepStrictEqual(inspect(parser('[]{/ name="\\""}')), [['<a href="/" class="invalid">/</a>'], '']);
182
- assert.deepStrictEqual(inspect(parser('[]{/ __proto__}')), [['<a href="/" class="invalid">/</a>'], '']);
183
- assert.deepStrictEqual(inspect(parser('[]{/ constructor}')), [['<a href="/" class="invalid">/</a>'], '']);
184
- assert.deepStrictEqual(inspect(parser('[]{/ rel="prefetch"}')), [['<a href="/" class="invalid">/</a>'], '']);
185
- assert.deepStrictEqual(inspect(parser('[]{/ aspect-ratio="4/3"}')), [['<a href="/" class="invalid">/</a>'], '']);
186
- assert.deepStrictEqual(inspect(parser('[]{/ 4:3}')), [['<a href="/" class="invalid">/</a>'], '']);
187
- assert.deepStrictEqual(inspect(parser('[]{/ =}')), [['<a href="/" class="invalid">/</a>'], '']);
188
- assert.deepStrictEqual(inspect(parser('[]{/ name}')), [['<a href="/" class="invalid">/</a>'], '']);
175
+ assert.deepStrictEqual(inspect(parser('[]{/ name=}')), [['<a class="invalid" href="/">/</a>'], '']);
176
+ assert.deepStrictEqual(inspect(parser('[]{/ name="}')), [['<a class="invalid" href="/">/</a>'], '']);
177
+ assert.deepStrictEqual(inspect(parser('[]{/ name="""}')), [['<a class="invalid" href="/">/</a>'], '']);
178
+ assert.deepStrictEqual(inspect(parser('[]{/ name}')), [['<a class="invalid" href="/">/</a>'], '']);
179
+ assert.deepStrictEqual(inspect(parser('[]{/ name=""}')), [['<a class="invalid" href="/">/</a>'], '']);
180
+ assert.deepStrictEqual(inspect(parser('[]{/ name=" "}')), [['<a class="invalid" href="/">/</a>'], '']);
181
+ assert.deepStrictEqual(inspect(parser('[]{/ name="\\""}')), [['<a class="invalid" href="/">/</a>'], '']);
182
+ assert.deepStrictEqual(inspect(parser('[]{/ __proto__}')), [['<a class="invalid" href="/">/</a>'], '']);
183
+ assert.deepStrictEqual(inspect(parser('[]{/ constructor}')), [['<a class="invalid" href="/">/</a>'], '']);
184
+ assert.deepStrictEqual(inspect(parser('[]{/ rel="prefetch"}')), [['<a class="invalid" href="/">/</a>'], '']);
185
+ assert.deepStrictEqual(inspect(parser('[]{/ aspect-ratio="4/3"}')), [['<a class="invalid" href="/">/</a>'], '']);
186
+ assert.deepStrictEqual(inspect(parser('[]{/ 4:3}')), [['<a class="invalid" href="/">/</a>'], '']);
187
+ assert.deepStrictEqual(inspect(parser('[]{/ =}')), [['<a class="invalid" href="/">/</a>'], '']);
188
+ assert.deepStrictEqual(inspect(parser('[]{/ name}')), [['<a class="invalid" href="/">/</a>'], '']);
189
189
  assert.deepStrictEqual(inspect(parser('[]{/\nname}')), undefined);
190
190
  });
191
191
 
192
192
  it('nofollow', () => {
193
- assert.deepStrictEqual(inspect(parser('[]{/ nofollow=}')), [['<a href="/" class="invalid">/</a>'], '']);
194
- assert.deepStrictEqual(inspect(parser('[]{/ nofollow=nofollow}')), [['<a href="/" class="invalid">/</a>'], '']);
195
- assert.deepStrictEqual(inspect(parser('[]{/ nofollow=""}')), [['<a href="/" class="invalid">/</a>'], '']);
196
- assert.deepStrictEqual(inspect(parser('[]{/ nofollow="nofollow"}')), [['<a href="/" class="invalid">/</a>'], '']);
197
- assert.deepStrictEqual(inspect(parser('[]{/ nofollow nofollow}')), [['<a href="/" rel="nofollow" class="invalid">/</a>'], '']);
198
- assert.deepStrictEqual(inspect(parser('[]{/ nofollow}')), [['<a href="/" rel="nofollow">/</a>'], '']);
199
- assert.deepStrictEqual(inspect(parser('[]{/ nofollow }')), [['<a href="/" rel="nofollow">/</a>'], '']);
200
- assert.deepStrictEqual(inspect(parser('[]{ / nofollow}')), [['<a href="/" rel="nofollow">/</a>'], '']);
201
- assert.deepStrictEqual(inspect(parser('[]{ / nofollow }')), [['<a href="/" rel="nofollow">/</a>'], '']);
202
- assert.deepStrictEqual(inspect(parser('[]{http://host nofollow}')), [['<a href="http://host" target="_blank" rel="nofollow">http://host</a>'], '']);
203
- assert.deepStrictEqual(inspect(parser('[!http://host]{http://host nofollow}')), [['<a href="http://host" target="_blank" rel="nofollow"><img class="media" data-src="http://host" alt=""></a>'], '']);
193
+ assert.deepStrictEqual(inspect(parser('[]{/ nofollow=}')), [['<a class="invalid" href="/">/</a>'], '']);
194
+ assert.deepStrictEqual(inspect(parser('[]{/ nofollow=nofollow}')), [['<a class="invalid" href="/">/</a>'], '']);
195
+ assert.deepStrictEqual(inspect(parser('[]{/ nofollow=""}')), [['<a class="invalid" href="/">/</a>'], '']);
196
+ assert.deepStrictEqual(inspect(parser('[]{/ nofollow="nofollow"}')), [['<a class="invalid" href="/">/</a>'], '']);
197
+ assert.deepStrictEqual(inspect(parser('[]{/ nofollow nofollow}')), [['<a class="invalid" href="/" rel="nofollow">/</a>'], '']);
198
+ assert.deepStrictEqual(inspect(parser('[]{/ nofollow}')), [['<a class="link" href="/" rel="nofollow">/</a>'], '']);
199
+ assert.deepStrictEqual(inspect(parser('[]{/ nofollow }')), [['<a class="link" href="/" rel="nofollow">/</a>'], '']);
200
+ assert.deepStrictEqual(inspect(parser('[]{ / nofollow}')), [['<a class="link" href="/" rel="nofollow">/</a>'], '']);
201
+ assert.deepStrictEqual(inspect(parser('[]{ / nofollow }')), [['<a class="link" href="/" rel="nofollow">/</a>'], '']);
202
+ assert.deepStrictEqual(inspect(parser('[]{http://host nofollow}')), [['<a class="link" href="http://host" target="_blank" rel="nofollow">http://host</a>'], '']);
203
+ assert.deepStrictEqual(inspect(parser('[!http://host]{http://host nofollow}')), [['<a class="link" href="http://host" target="_blank" rel="nofollow"><img class="media" data-src="http://host" alt=""></a>'], '']);
204
204
  });
205
205
 
206
206
  });
@@ -5,7 +5,7 @@ import { Result, eval, exec } from '../../combinator/data/parser';
5
5
  import { union, inits, tails, sequence, some, constraint, syntax, creation, precedence, state, validate, surround, open, dup, reverse, lazy, fmap, bind } from '../../combinator';
6
6
  import { inline, media, shortmedia } from '../inline';
7
7
  import { attributes } from './html';
8
- import { autolink } from '../autolink';
8
+ import { autolink as autolink_ } from '../autolink';
9
9
  import { unescsource, str } from '../source';
10
10
  import { Syntax, State } from '../context';
11
11
  import { trimNode } from '../visibility';
@@ -25,8 +25,7 @@ export const link: LinkParser = lazy(() => validate(['[', '{'], union([
25
25
 
26
26
  const textlink: LinkParser.TextLinkParser = lazy(() =>
27
27
  constraint(State.link, false,
28
- state(State.link | State.media | State.annotation | State.reference | State.index | State.label | State.autolink,
29
- syntax(Syntax.link, 2, 10,
28
+ syntax(Syntax.link, 2, 10, State.linkable,
30
29
  bind(reverse(tails([
31
30
  dup(surround(
32
31
  '[',
@@ -39,17 +38,16 @@ const textlink: LinkParser.TextLinkParser = lazy(() =>
39
38
  assert(!html('div', content).querySelector('a, .media, .annotation, .reference'));
40
39
  if (content.length !== 0 && trimNode(content).length === 0) return;
41
40
  for (let source = stringify(content); source;) {
42
- const result = state(State.autolink, false, autolink)(source, context);
43
- if (typeof eval(result!)[0] === 'object') return;
44
- source = exec(result!);
41
+ const result = autolink({ source, context });
42
+ if (typeof eval(result, [])[0] === 'object') return;
43
+ source = exec(result, '');
45
44
  }
46
45
  return parse(content, params, rest, context);
47
- })))));
46
+ }))));
48
47
 
49
48
  const medialink: LinkParser.MediaLinkParser = lazy(() =>
50
49
  constraint(State.link | State.media, false,
51
- state(State.link | State.annotation | State.reference | State.index | State.label | State.autolink,
52
- syntax(Syntax.link, 2, 10,
50
+ syntax(Syntax.link, 2, 10, State.linkable ^ State.media,
53
51
  bind(reverse(sequence([
54
52
  dup(surround(
55
53
  '[',
@@ -58,7 +56,7 @@ const medialink: LinkParser.MediaLinkParser = lazy(() =>
58
56
  dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
59
57
  ])),
60
58
  ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) =>
61
- parse(content, params, rest, context))))));
59
+ parse(content, params, rest, context)))));
62
60
 
63
61
  export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() =>
64
62
  creation(10, precedence(2,
@@ -83,6 +81,8 @@ export const option: LinkParser.ParameterParser.OptionParser = union([
83
81
  fmap(str(/^[^\S\n]+[^\s{}]+/), opt => [` \\${opt.slice(1)}`]),
84
82
  ]);
85
83
 
84
+ const autolink = state(State.autolink, false, state(State.shortcut, autolink_));
85
+
86
86
  function parse(
87
87
  content: (string | HTMLElement)[],
88
88
  params: string[],
@@ -102,7 +102,6 @@ function parse(
102
102
  context.host?.href || location.href),
103
103
  context.host?.origin || location.origin);
104
104
  if (el.className === 'invalid') return [[el], rest];
105
- assert(el.classList.length === 0);
106
105
  return [[define(el, attributes('link', [], optspec, params))], rest];
107
106
  }
108
107
 
@@ -148,6 +147,7 @@ function elem(
148
147
  }
149
148
  return html('a',
150
149
  {
150
+ class: 'link',
151
151
  href: uri.source,
152
152
  target: undefined
153
153
  || uri.origin !== origin
@@ -169,7 +169,7 @@ function elem(
169
169
  && pattern.test(INSECURE_URI)
170
170
  && pattern.test(content[0])
171
171
  && INSECURE_URI.replace(/[^+\d]/g, '') === content[0].replace(/[^+\d]/g, ''):
172
- return html('a', { href: uri.source }, content);
172
+ return html('a', { class: 'tel', href: uri.source }, content);
173
173
  }
174
174
  type = 'content';
175
175
  message = 'Invalid phone number';
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
4
4
 
5
5
  describe('Unit: parser/inline/mark', () => {
6
6
  describe('mark', () => {
7
- const parser = (source: string) => some(mark)(source, {});
7
+ const parser = (source: string) => some(mark)({ source, context: {} });
8
8
 
9
9
  it('invalid', () => {
10
10
  assert.deepStrictEqual(inspect(parser('')), undefined);
@@ -3,13 +3,13 @@ import { union, some, syntax, surround, open, lazy } from '../../combinator';
3
3
  import { inline } from '../inline';
4
4
  import { str } from '../source';
5
5
  import { startTight, blankWith } from '../visibility';
6
- import { Syntax } from '../context';
6
+ import { Syntax, State } from '../context';
7
7
  import { html, defrag } from 'typed-dom/dom';
8
8
  import { unshift } from 'spica/array';
9
9
 
10
10
  export const mark: MarkParser = lazy(() => surround(
11
11
  str('=='),
12
- syntax(Syntax.none, 1, 1,
12
+ syntax(Syntax.none, 1, 1, State.none,
13
13
  startTight(some(union([
14
14
  some(inline, blankWith('==')),
15
15
  open(some(inline, '='), mark),
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
4
4
 
5
5
  describe('Unit: parser/inline/math', () => {
6
6
  describe('math', () => {
7
- const parser = (source: string) => some(math)(source, {});
7
+ const parser = (source: string) => some(math)({ source, context: {} });
8
8
 
9
9
  it('invalid', () => {
10
10
  assert.deepStrictEqual(inspect(parser('')), undefined);
@@ -16,7 +16,7 @@ export const math: MathParser = lazy(() => validate('$', creation(rewrite(
16
16
  ]))),
17
17
  /^\$(?![0-9A-Za-z])/),
18
18
  ]),
19
- (source, { caches: { math: cache } = {} }) => [[
19
+ ({ source, context: { caches: { math: cache } = {} } }) => [[
20
20
  cache?.get(source)?.cloneNode(true) ||
21
21
  html('span',
22
22
  !forbiddenCommand.test(source)
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
4
4
 
5
5
  describe('Unit: parser/inline/media', () => {
6
6
  describe('media', () => {
7
- const parser = (source: string) => some(media)(source, {});
7
+ const parser = (source: string) => some(media)({ source, context: {} });
8
8
 
9
9
  it('xss', () => {
10
10
  assert.deepStrictEqual(inspect(parser('![]{javascript:alert}')), [['<img class="media invalid" data-src="javascript:alert" alt="">'], '']);
@@ -90,6 +90,7 @@ describe('Unit: parser/inline/media', () => {
90
90
  it('nest', () => {
91
91
  assert.deepStrictEqual(inspect(parser('![\\[]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="["></a>'], '']);
92
92
  assert.deepStrictEqual(inspect(parser('![\\"]{"?"#"}')), [['<a href="&quot;?&quot;#&quot;" target="_blank"><img class="media" data-src="&quot;?&quot;#&quot;" alt="&quot;"></a>'], '']);
93
+ assert.deepStrictEqual(inspect(parser('![*a*]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="*a*"></a>'], '']);
93
94
  assert.deepStrictEqual(inspect(parser('![<wbr>]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="<wbr>"></a>'], '']);
94
95
  });
95
96
 
@@ -21,7 +21,7 @@ Object.setPrototypeOf(optspec, null);
21
21
  export const media: MediaParser = lazy(() => validate(['![', '!{'], open(
22
22
  '!',
23
23
  constraint(State.media, false,
24
- syntax(Syntax.media, 2, 10,
24
+ syntax(Syntax.media, 2, 10, State.none,
25
25
  bind(verify(fmap(tails([
26
26
  dup(surround(
27
27
  '[',
@@ -55,11 +55,11 @@ export const media: MediaParser = lazy(() => validate(['![', '!{'], open(
55
55
  el.style.aspectRatio = el.getAttribute('aspect-ratio')!;
56
56
  }
57
57
  if (context.state! & State.link) return [[el], rest];
58
- if (cache && cache.tagName !== 'IMG') return creation(10, (..._) => [[el!], rest])('!', context);
58
+ if (cache && cache.tagName !== 'IMG') return creation(10, (..._) => [[el!], rest])({ source: '!', context });
59
59
  return fmap(
60
60
  unsafelink as MediaParser,
61
- ([link]) => [define(link, { target: '_blank' }, [el])])
62
- (`{ ${INSECURE_URI}${params.join('')} }${rest}`, context);
61
+ ([link]) => [define(link, { class: null, target: '_blank' }, [el])])
62
+ ({ source: `{ ${INSECURE_URI}${params.join('')} }${rest}`, context });
63
63
  }))))));
64
64
 
65
65
  const bracket: MediaParser.TextParser.BracketParser = lazy(() => creation(union([
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
4
4
 
5
5
  describe('Unit: parser/inline/reference', () => {
6
6
  describe('reference', () => {
7
- const parser = (source: string) => some(reference)(source, {});
7
+ const parser = (source: string) => some(reference)({ source, context: {} });
8
8
 
9
9
  it('invalid', () => {
10
10
  assert.deepStrictEqual(inspect(parser('')), undefined);
@@ -44,9 +44,9 @@ describe('Unit: parser/inline/reference', () => {
44
44
 
45
45
  it('nest', () => {
46
46
  assert.deepStrictEqual(inspect(parser('[[`a`]]')), [['<sup class="reference"><span><code data-src="`a`">a</code></span></sup>'], '']);
47
- assert.deepStrictEqual(inspect(parser('[[@a]]')), [['<sup class="reference"><span><a href="/@a" class="account">@a</a></span></sup>'], '']);
48
- assert.deepStrictEqual(inspect(parser('[[http://host]]')), [['<sup class="reference"><span><a href="http://host" target="_blank">http://host</a></span></sup>'], '']);
49
- assert.deepStrictEqual(inspect(parser('[[![]{a}]]')), [['<sup class="reference"><span>!<a href="a">a</a></span></sup>'], '']);
47
+ assert.deepStrictEqual(inspect(parser('[[@a]]')), [['<sup class="reference"><span><a class="account" href="/@a">@a</a></span></sup>'], '']);
48
+ assert.deepStrictEqual(inspect(parser('[[http://host]]')), [['<sup class="reference"><span><a class="url" href="http://host" target="_blank">http://host</a></span></sup>'], '']);
49
+ assert.deepStrictEqual(inspect(parser('[[![]{a}]]')), [['<sup class="reference"><span>!<a class="link" href="a">a</a></span></sup>'], '']);
50
50
  assert.deepStrictEqual(inspect(parser('[[[a]]]')), [['<sup class="reference"><span>[a]</span></sup>'], '']);
51
51
  assert.deepStrictEqual(inspect(parser('[[[[a]]]]')), [['<sup class="reference"><span>[[a]]</span></sup>'], '']);
52
52
  assert.deepStrictEqual(inspect(parser('[[((a))]]')), [['<sup class="reference"><span><span class="paren">((a))</span></span></sup>'], '']);
@@ -1,6 +1,6 @@
1
1
  import { undefined } from 'spica/global';
2
2
  import { ReferenceParser } from '../inline';
3
- import { union, subsequence, some, context, syntax, creation, constraint, state, surround, open, lazy, bind } from '../../combinator';
3
+ import { union, subsequence, some, context, syntax, creation, constraint, surround, open, lazy, bind } from '../../combinator';
4
4
  import { inline } from '../inline';
5
5
  import { str, stropt } from '../source';
6
6
  import { Syntax, State } from '../context';
@@ -11,15 +11,14 @@ import { html, defrag } from 'typed-dom/dom';
11
11
  export const reference: ReferenceParser = lazy(() => surround(
12
12
  '[[',
13
13
  constraint(State.reference, false,
14
- state(State.annotation | State.reference | State.media,
15
- syntax(Syntax.reference, 6, 1,
14
+ syntax(Syntax.reference, 6, 1, State.annotation | State.reference | State.media,
16
15
  startLoose(
17
16
  context({ delimiters: undefined },
18
17
  subsequence([
19
18
  abbr,
20
19
  open(stropt(/^(?=\^)/), some(inline, ']', [[/^\\?\n/, 9], [']', 2], [']]', 6]])),
21
20
  some(inline, ']', [[/^\\?\n/, 9], [']', 2], [']]', 6]]),
22
- ])), ']')))),
21
+ ])), ']'))),
23
22
  ']]',
24
23
  false,
25
24
  ([, ns], rest) => [[html('sup', attributes(ns), [html('span', trimNode(defrag(ns)))])], rest]));
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
4
4
 
5
5
  describe('Unit: parser/inline/ruby', () => {
6
6
  describe('ruby', () => {
7
- const parser = (source: string) => some(ruby)(source, {});
7
+ const parser = (source: string) => some(ruby)({ source, context: {} });
8
8
 
9
9
  it('invalid', () => {
10
10
  assert.deepStrictEqual(inspect(parser('')), undefined);
@@ -4,12 +4,12 @@ import { eval, exec } from '../../combinator/data/parser';
4
4
  import { sequence, syntax, creation, validate, verify, focus, surround, lazy, fmap } from '../../combinator';
5
5
  import { unsafehtmlentity } from './htmlentity';
6
6
  import { text as txt } from '../source';
7
- import { Syntax } from '../context';
7
+ import { Syntax, State } from '../context';
8
8
  import { isStartTightNodes } from '../visibility';
9
9
  import { html, defrag } from 'typed-dom/dom';
10
10
  import { unshift, push } from 'spica/array';
11
11
 
12
- export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.none, 2, 1, fmap(verify(
12
+ export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.none, 2, 1, State.none, fmap(verify(
13
13
  sequence([
14
14
  surround('[', focus(/^(?:\\[^\n]|[^\\[\](){}"\n])+(?=]\()/, text), ']'),
15
15
  surround('(', focus(/^(?:\\[^\n]|[^\\[\](){}"\n])+(?=\))/, text), ')'),
@@ -48,14 +48,14 @@ export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.none, 2,
48
48
  }
49
49
  }))));
50
50
 
51
- const text: RubyParser.TextParser = creation((source, context) => {
51
+ const text: RubyParser.TextParser = creation(({ source, context }) => {
52
52
  const acc = [''];
53
53
  while (source !== '') {
54
54
  assert(source[0] !== '\n');
55
55
  switch (source[0]) {
56
56
  // @ts-expect-error
57
57
  case '&': {
58
- const result = unsafehtmlentity(source, context);
58
+ const result = unsafehtmlentity({ source, context });
59
59
  if (result) {
60
60
  acc[acc.length - 1] += eval(result)[0];
61
61
  source = exec(result, source.slice(1));
@@ -69,7 +69,7 @@ const text: RubyParser.TextParser = creation((source, context) => {
69
69
  source = source.slice(1);
70
70
  continue;
71
71
  }
72
- const result = txt(source, context)!;
72
+ const result = txt({ source, context })!;
73
73
  assert(result);
74
74
  acc[acc.length - 1] += eval(result)[0] ?? source.slice(0, source.length - exec(result).length);
75
75
  source = exec(result);
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
4
4
 
5
5
  describe('Unit: parser/inline/shortmedia', () => {
6
6
  describe('shortmedia', () => {
7
- const parser = (source: string) => some(shortmedia)(source, {});
7
+ const parser = (source: string) => some(shortmedia)({ source, context: {} });
8
8
 
9
9
  it('invalid', () => {
10
10
  assert.deepStrictEqual(inspect(parser('')), undefined);
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
4
4
 
5
5
  describe('Unit: parser/inline/strong', () => {
6
6
  describe('strong', () => {
7
- const parser = (source: string) => some(strong)(source, {});
7
+ const parser = (source: string) => some(strong)({ source, context: {} });
8
8
 
9
9
  it('invalid', () => {
10
10
  assert.deepStrictEqual(inspect(parser('**')), undefined);