securemark 0.259.2 → 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 (53) hide show
  1. package/CHANGELOG.md +5 -0
  2. package/design.md +14 -4
  3. package/dist/index.js +203 -153
  4. package/package.json +1 -1
  5. package/src/combinator/control/constraint/block.ts +2 -3
  6. package/src/combinator/control/constraint/contract.ts +5 -7
  7. package/src/combinator/control/constraint/line.ts +1 -2
  8. package/src/combinator/control/manipulation/convert.ts +1 -2
  9. package/src/combinator/control/manipulation/fence.ts +1 -2
  10. package/src/combinator/control/manipulation/match.ts +2 -3
  11. package/src/combinator/control/manipulation/scope.ts +3 -5
  12. package/src/combinator/control/manipulation/surround.ts +2 -2
  13. package/src/combinator/control/monad/bind.ts +2 -3
  14. package/src/combinator/data/parser/context.ts +14 -18
  15. package/src/combinator/data/parser/inits.ts +1 -2
  16. package/src/combinator/data/parser/sequence.ts +1 -2
  17. package/src/combinator/data/parser/some.ts +1 -2
  18. package/src/parser/api/parse.test.ts +19 -19
  19. package/src/parser/autolink.test.ts +6 -6
  20. package/src/parser/block/blockquote.test.ts +8 -8
  21. package/src/parser/block/codeblock.test.ts +4 -4
  22. package/src/parser/block/dlist.test.ts +1 -1
  23. package/src/parser/block/extension/figure.test.ts +1 -1
  24. package/src/parser/block/heading.test.ts +5 -5
  25. package/src/parser/block/olist.test.ts +1 -1
  26. package/src/parser/block/paragraph.test.ts +14 -14
  27. package/src/parser/block/reply/cite.test.ts +11 -11
  28. package/src/parser/block/reply/quote.test.ts +3 -3
  29. package/src/parser/block/reply.test.ts +8 -8
  30. package/src/parser/block/sidefence.test.ts +6 -6
  31. package/src/parser/block/ulist.test.ts +1 -1
  32. package/src/parser/context.ts +8 -7
  33. package/src/parser/inline/annotation.test.ts +3 -3
  34. package/src/parser/inline/autolink/account.test.ts +11 -11
  35. package/src/parser/inline/autolink/account.ts +4 -2
  36. package/src/parser/inline/autolink/anchor.test.ts +9 -9
  37. package/src/parser/inline/autolink/anchor.ts +14 -11
  38. package/src/parser/inline/autolink/channel.test.ts +3 -3
  39. package/src/parser/inline/autolink/hashnum.ts +4 -2
  40. package/src/parser/inline/autolink/hashtag.test.ts +20 -20
  41. package/src/parser/inline/autolink/hashtag.ts +4 -2
  42. package/src/parser/inline/autolink/url.test.ts +55 -55
  43. package/src/parser/inline/autolink/url.ts +5 -3
  44. package/src/parser/inline/html.test.ts +0 -2
  45. package/src/parser/inline/html.ts +1 -1
  46. package/src/parser/inline/link.test.ts +110 -110
  47. package/src/parser/inline/link.ts +8 -6
  48. package/src/parser/inline/media.test.ts +1 -0
  49. package/src/parser/inline/media.ts +1 -1
  50. package/src/parser/inline/reference.test.ts +3 -3
  51. package/src/parser/inline.test.ts +51 -51
  52. package/src/renderer/render/media/pdf.ts +1 -0
  53. package/src/util/info.ts +2 -4
@@ -1,17 +1,19 @@
1
1
  import { AutolinkParser } from '../../inline';
2
- import { union, some, creation, precedence, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
2
+ import { union, some, creation, precedence, validate, focus, rewrite, convert, surround, open, lazy, fmap } from '../../../combinator';
3
3
  import { unsafelink } from '../link';
4
4
  import { unescsource } from '../../source';
5
+ import { define } from 'typed-dom/dom';
5
6
 
6
7
  const closer = /^[-+*=~^,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
7
8
 
8
- export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'https://'], rewrite(
9
+ export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'https://'], fmap(rewrite(
9
10
  open(
10
11
  /^https?:\/\/(?=[\x21-\x7E])/,
11
12
  focus(/^[\x21-\x7E]+/, some(union([bracket, some(unescsource, closer)])))),
12
13
  convert(
13
14
  url => `{ ${url} }`,
14
- union([unsafelink])))));
15
+ union([unsafelink]))),
16
+ ([el]) => [define(el, { class: 'url' })])));
15
17
 
16
18
  const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creation(precedence(2, union([
17
19
  surround('(', some(union([bracket, unescsource]), ')'), ')', true),
@@ -10,12 +10,10 @@ describe('Unit: parser/inline/html', () => {
10
10
  assert.deepStrictEqual(inspect(parser('<script>')), [['<span class="invalid">&lt;script&gt;</span>'], '']);
11
11
  assert.deepStrictEqual(inspect(parser('<script>alert()<script>')), [['<span class="invalid">&lt;script&gt;alert<span class="paren">()</span><span class="invalid">&lt;script&gt;</span></span>'], '']);
12
12
  assert.deepStrictEqual(inspect(parser('<script>alert()</script>')), [['<span class="invalid">&lt;script&gt;alert<span class="paren">()</span>&lt;/script&gt;</span>'], '']);
13
- assert.deepStrictEqual(inspect(parser('<script src="\\""></script>')), [['<span class="invalid">&lt;script src="\\""&gt;&lt;/script&gt;</span>'], '']);
14
13
  assert.deepStrictEqual(inspect(parser('<bdi onclick="alert()">')), [['<span class="invalid">&lt;bdi onclick="alert()"&gt;</span>'], '']);
15
14
  assert.deepStrictEqual(inspect(parser('<bdi onclick="alert()"></bdi>')), [['<span class="invalid">&lt;bdi onclick="alert()"&gt;&lt;/bdi&gt;</span>'], '']);
16
15
  assert.deepStrictEqual(inspect(parser('<bdi onclick="alert()">a</bdi>')), [['<span class="invalid">&lt;bdi onclick="alert()"&gt;a&lt;/bdi&gt;</span>'], '']);
17
16
  assert.deepStrictEqual(inspect(parser('<bdi><bdi onclick="alert()">a</bdi></bdi>')), [['<bdi><span class="invalid">&lt;bdi onclick="alert()"&gt;a&lt;/bdi&gt;</span></bdi>'], '']);
18
- assert.deepStrictEqual(inspect(parser('<bdo dir="rtl\\"><">a</bdo>')), [['<span class="invalid">&lt;bdo dir="rtl\\"&gt;&lt;"&gt;a&lt;/bdo&gt;</span>'], '']);
19
17
  });
20
18
 
21
19
  it('invalid', () => {
@@ -64,7 +64,7 @@ export const html: HTMLParser = lazy(() => validate('<', validate(/^<[a-z]+(?=[^
64
64
  ])))));
65
65
 
66
66
  export const attribute: HTMLParser.AttributeParser = union([
67
- str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|>)/i),
67
+ str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="[^"\n]*")?(?=[^\S\n]|>)/i),
68
68
  ]);
69
69
 
70
70
  // https://developer.mozilla.org/en-US/docs/Web/HTML/Element
@@ -12,11 +12,11 @@ describe('Unit: parser/inline/link', () => {
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';
@@ -38,9 +38,9 @@ const textlink: LinkParser.TextLinkParser = lazy(() =>
38
38
  assert(!html('div', content).querySelector('a, .media, .annotation, .reference'));
39
39
  if (content.length !== 0 && trimNode(content).length === 0) return;
40
40
  for (let source = stringify(content); source;) {
41
- const result = state(State.autolink, false, autolink)({ source, context });
42
- if (typeof eval(result!)[0] === 'object') return;
43
- source = exec(result!);
41
+ const result = autolink({ source, context });
42
+ if (typeof eval(result, [])[0] === 'object') return;
43
+ source = exec(result, '');
44
44
  }
45
45
  return parse(content, params, rest, context);
46
46
  }))));
@@ -81,6 +81,8 @@ export const option: LinkParser.ParameterParser.OptionParser = union([
81
81
  fmap(str(/^[^\S\n]+[^\s{}]+/), opt => [` \\${opt.slice(1)}`]),
82
82
  ]);
83
83
 
84
+ const autolink = state(State.autolink, false, state(State.shortcut, autolink_));
85
+
84
86
  function parse(
85
87
  content: (string | HTMLElement)[],
86
88
  params: string[],
@@ -100,7 +102,6 @@ function parse(
100
102
  context.host?.href || location.href),
101
103
  context.host?.origin || location.origin);
102
104
  if (el.className === 'invalid') return [[el], rest];
103
- assert(el.classList.length === 0);
104
105
  return [[define(el, attributes('link', [], optspec, params))], rest];
105
106
  }
106
107
 
@@ -146,6 +147,7 @@ function elem(
146
147
  }
147
148
  return html('a',
148
149
  {
150
+ class: 'link',
149
151
  href: uri.source,
150
152
  target: undefined
151
153
  || uri.origin !== origin
@@ -167,7 +169,7 @@ function elem(
167
169
  && pattern.test(INSECURE_URI)
168
170
  && pattern.test(content[0])
169
171
  && INSECURE_URI.replace(/[^+\d]/g, '') === content[0].replace(/[^+\d]/g, ''):
170
- return html('a', { href: uri.source }, content);
172
+ return html('a', { class: 'tel', href: uri.source }, content);
171
173
  }
172
174
  type = 'content';
173
175
  message = 'Invalid phone number';
@@ -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
 
@@ -58,7 +58,7 @@ export const media: MediaParser = lazy(() => validate(['![', '!{'], open(
58
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])])
61
+ ([link]) => [define(link, { class: null, target: '_blank' }, [el])])
62
62
  ({ source: `{ ${INSECURE_URI}${params.join('')} }${rest}`, context });
63
63
  }))))));
64
64
 
@@ -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>'], '']);