securemark 0.292.0 → 0.293.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/dist/index.js +395 -287
- package/markdown.d.ts +22 -39
- package/package.json +1 -1
- package/src/combinator/control/constraint/contract.ts +6 -15
- package/src/combinator/control/manipulation/clear.ts +3 -4
- package/src/combinator/control/manipulation/fence.ts +3 -1
- package/src/combinator/control/manipulation/indent.ts +5 -11
- package/src/combinator/control/manipulation/match.ts +3 -2
- package/src/combinator/control/manipulation/recovery.ts +1 -1
- package/src/combinator/control/manipulation/scope.ts +3 -10
- package/src/combinator/control/manipulation/surround.ts +4 -24
- package/src/combinator/data/parser/context/delimiter.ts +10 -9
- package/src/combinator/data/parser/context.ts +31 -0
- package/src/combinator/data/parser/inits.ts +1 -1
- package/src/combinator/data/parser/sequence.ts +1 -1
- package/src/combinator/data/parser/some.test.ts +1 -1
- package/src/combinator/data/parser/some.ts +4 -5
- package/src/combinator/data/parser.ts +0 -1
- package/src/parser/api/parse.test.ts +16 -8
- package/src/parser/api/parse.ts +1 -2
- package/src/parser/autolink.test.ts +7 -7
- package/src/parser/autolink.ts +2 -4
- package/src/parser/block/blockquote.test.ts +1 -1
- package/src/parser/block/blockquote.ts +6 -6
- package/src/parser/block/codeblock.ts +1 -1
- package/src/parser/block/dlist.test.ts +1 -1
- package/src/parser/block/dlist.ts +6 -6
- package/src/parser/block/extension/aside.ts +1 -1
- package/src/parser/block/extension/example.ts +1 -1
- package/src/parser/block/extension/fig.ts +3 -3
- package/src/parser/block/extension/figbase.ts +1 -1
- package/src/parser/block/extension/figure.ts +4 -4
- package/src/parser/block/extension/message.ts +1 -1
- package/src/parser/block/extension/placeholder.ts +1 -1
- package/src/parser/block/extension/table.test.ts +1 -1
- package/src/parser/block/extension/table.ts +15 -15
- package/src/parser/block/extension.ts +2 -2
- package/src/parser/block/heading.test.ts +1 -1
- package/src/parser/block/heading.ts +2 -2
- package/src/parser/block/ilist.test.ts +3 -3
- package/src/parser/block/ilist.ts +4 -4
- package/src/parser/block/mathblock.ts +1 -1
- package/src/parser/block/mediablock.ts +1 -1
- package/src/parser/block/olist.test.ts +16 -14
- package/src/parser/block/olist.ts +12 -12
- package/src/parser/block/pagebreak.ts +1 -1
- package/src/parser/block/paragraph.test.ts +2 -2
- package/src/parser/block/paragraph.ts +2 -2
- package/src/parser/block/reply/cite.ts +4 -4
- package/src/parser/block/reply/quote.ts +5 -4
- package/src/parser/block/reply.ts +3 -3
- package/src/parser/block/sidefence.ts +3 -3
- package/src/parser/block/table.ts +10 -10
- package/src/parser/block/ulist.test.ts +8 -7
- package/src/parser/block/ulist.ts +6 -6
- package/src/parser/block.ts +48 -15
- package/src/parser/header.ts +3 -3
- package/src/parser/inline/autolink/account.test.ts +8 -7
- package/src/parser/inline/autolink/account.ts +11 -8
- package/src/parser/inline/autolink/anchor.test.ts +1 -1
- package/src/parser/inline/autolink/anchor.ts +21 -17
- package/src/parser/inline/autolink/channel.test.ts +8 -8
- package/src/parser/inline/autolink/channel.ts +40 -15
- package/src/parser/inline/autolink/email.test.ts +15 -15
- package/src/parser/inline/autolink/email.ts +5 -7
- package/src/parser/inline/autolink/hashnum.test.ts +4 -9
- package/src/parser/inline/autolink/hashnum.ts +8 -4
- package/src/parser/inline/autolink/hashtag.test.ts +9 -10
- package/src/parser/inline/autolink/hashtag.ts +9 -6
- package/src/parser/inline/autolink/url.test.ts +72 -74
- package/src/parser/inline/autolink/url.ts +19 -23
- package/src/parser/inline/autolink.ts +21 -24
- package/src/parser/inline/bracket.ts +3 -3
- package/src/parser/inline/code.ts +2 -2
- package/src/parser/inline/deletion.test.ts +2 -2
- package/src/parser/inline/deletion.ts +1 -1
- package/src/parser/inline/emphasis.test.ts +5 -5
- package/src/parser/inline/emphasis.ts +2 -7
- package/src/parser/inline/emstrong.test.ts +14 -14
- package/src/parser/inline/emstrong.ts +4 -16
- package/src/parser/inline/extension/index.test.ts +5 -3
- package/src/parser/inline/extension/index.ts +4 -7
- package/src/parser/inline/extension/indexer.test.ts +1 -1
- package/src/parser/inline/extension/indexer.ts +3 -3
- package/src/parser/inline/extension/label.ts +1 -1
- package/src/parser/inline/extension/placeholder.ts +1 -1
- package/src/parser/inline/html.test.ts +2 -2
- package/src/parser/inline/html.ts +14 -14
- package/src/parser/inline/htmlentity.ts +1 -1
- package/src/parser/inline/insertion.test.ts +2 -2
- package/src/parser/inline/insertion.ts +1 -1
- package/src/parser/inline/italic.test.ts +5 -5
- package/src/parser/inline/italic.ts +1 -1
- package/src/parser/inline/link.ts +15 -15
- package/src/parser/inline/mark.test.ts +5 -5
- package/src/parser/inline/mark.ts +1 -1
- package/src/parser/inline/math.test.ts +6 -6
- package/src/parser/inline/math.ts +7 -11
- package/src/parser/inline/media.ts +9 -9
- package/src/parser/inline/reference.test.ts +4 -4
- package/src/parser/inline/reference.ts +4 -4
- package/src/parser/inline/remark.test.ts +7 -7
- package/src/parser/inline/remark.ts +2 -2
- package/src/parser/inline/ruby.ts +3 -1
- package/src/parser/inline/shortmedia.ts +6 -9
- package/src/parser/inline/strong.test.ts +5 -5
- package/src/parser/inline/strong.ts +2 -7
- package/src/parser/inline.test.ts +13 -11
- package/src/parser/source/escapable.test.ts +6 -6
- package/src/parser/source/escapable.ts +29 -5
- package/src/parser/source/line.ts +28 -4
- package/src/parser/source/str.ts +5 -27
- package/src/parser/source/text.test.ts +27 -27
- package/src/parser/source/text.ts +58 -6
- package/src/parser/source/unescapable.test.ts +6 -6
- package/src/parser/source/unescapable.ts +27 -3
- package/src/parser/util.ts +3 -3
- package/src/parser/visibility.ts +14 -9
|
@@ -1,19 +1,17 @@
|
|
|
1
1
|
import { AutolinkParser } from '../../inline';
|
|
2
2
|
import { State, Backtrack } from '../../context';
|
|
3
|
-
import { union, state, constraint, verify, rewrite,
|
|
3
|
+
import { union, state, constraint, verify, rewrite, open } from '../../../combinator';
|
|
4
4
|
import { str } from '../../source';
|
|
5
5
|
import { html } from 'typed-dom/dom';
|
|
6
6
|
|
|
7
7
|
// https://html.spec.whatwg.org/multipage/input.html
|
|
8
8
|
|
|
9
9
|
export const email: AutolinkParser.EmailParser = rewrite(
|
|
10
|
-
|
|
11
|
-
str(/^[0-9a-z]/i),
|
|
10
|
+
open(/(?<![0-9a-z][_.+-]?)(?=[0-9a-z])/yi,
|
|
12
11
|
verify(
|
|
13
|
-
str(
|
|
14
|
-
([source]) => source.length <= 255
|
|
15
|
-
|
|
16
|
-
false, undefined, undefined,
|
|
12
|
+
str(/[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z@#]|>>|:\S)/yi),
|
|
13
|
+
([source]) => source.length <= 255),
|
|
14
|
+
false,
|
|
17
15
|
[3 | Backtrack.autolink]),
|
|
18
16
|
union([
|
|
19
17
|
constraint(State.autolink, state(State.autolink,
|
|
@@ -12,10 +12,10 @@ describe('Unit: parser/inline/autolink/hashnum', () => {
|
|
|
12
12
|
assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
|
|
13
13
|
assert.deepStrictEqual(inspect(parser('#'), ctx), [['#'], '']);
|
|
14
14
|
assert.deepStrictEqual(inspect(parser('# '), ctx), [['#'], ' ']);
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('#1#'), ctx), [['#1
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('#1#2'), ctx), [['#1
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('#1#2#3'), ctx), [['#1
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('#1@2'), ctx), [['#1
|
|
15
|
+
assert.deepStrictEqual(inspect(parser('#1#'), ctx), [['#1'], '#']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser('#1#2'), ctx), [['#1'], '#2']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('#1#2#3'), ctx), [['#1'], '#2#3']);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser('#1@2'), ctx), [['#1'], '@2']);
|
|
19
19
|
assert.deepStrictEqual(inspect(parser('#\\'), ctx), [['#'], '\\']);
|
|
20
20
|
assert.deepStrictEqual(inspect(parser('#\\ '), ctx), [['#'], '\\ ']);
|
|
21
21
|
assert.deepStrictEqual(inspect(parser('#\\\n'), ctx), [['#'], '\\\n']);
|
|
@@ -28,11 +28,6 @@ describe('Unit: parser/inline/autolink/hashnum', () => {
|
|
|
28
28
|
assert.deepStrictEqual(inspect(parser('#{#}'), ctx), [['#'], '{#}']);
|
|
29
29
|
assert.deepStrictEqual(inspect(parser('#{1}'), ctx), [['#'], '{1}']);
|
|
30
30
|
assert.deepStrictEqual(inspect(parser('# '), ctx), [['#'], ' ']);
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('0#1'), ctx), [['0#1'], '']);
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('0#a'), ctx), [['0#a'], '']);
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('0##1'), ctx), [['0##1'], '']);
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('0##a'), ctx), [['0##a'], '']);
|
|
35
|
-
assert.deepStrictEqual(inspect(parser('あ#1'), ctx), [['あ#1'], '']);
|
|
36
31
|
assert.deepStrictEqual(inspect(parser(' #1'), ctx), undefined);
|
|
37
32
|
assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(10)}`), ctx), [[`#${'1'.repeat(10)}`], '']);
|
|
38
33
|
assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(10)}a`), ctx), [[`#${'1'.repeat(10)}a`], '']);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AutolinkParser } from '../../inline';
|
|
2
|
-
import { State } from '../../context';
|
|
2
|
+
import { State, Backtrack } from '../../context';
|
|
3
3
|
import { union, state, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
|
|
4
4
|
import { unsafelink } from '../link';
|
|
5
5
|
import { emoji } from './hashtag';
|
|
@@ -8,10 +8,14 @@ import { define } from 'typed-dom/dom';
|
|
|
8
8
|
|
|
9
9
|
export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
|
|
10
10
|
open(
|
|
11
|
-
|
|
11
|
+
new RegExp([
|
|
12
|
+
/(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source,
|
|
13
|
+
].join('').replace(/emoji/g, emoji), 'yu'),
|
|
12
14
|
str(new RegExp([
|
|
13
|
-
|
|
14
|
-
].join('').replace(/emoji
|
|
15
|
+
/[0-9]{1,9}(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
|
|
16
|
+
].join('').replace(/emoji/g, emoji), 'yu')),
|
|
17
|
+
false,
|
|
18
|
+
[1 | Backtrack.autolink]),
|
|
15
19
|
union([
|
|
16
20
|
constraint(State.autolink, state(State.autolink, fmap(convert(
|
|
17
21
|
source => `[${source}]{ ${source.slice(1)} }`,
|
|
@@ -12,10 +12,12 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
|
|
|
12
12
|
assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
|
|
13
13
|
assert.deepStrictEqual(inspect(parser('#'), ctx), [['#'], '']);
|
|
14
14
|
assert.deepStrictEqual(inspect(parser('# '), ctx), [['#'], ' ']);
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('#a#'), ctx), [['#a
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('#a#b'), ctx), [['#a
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('#a#b#c'), ctx), [['#a
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('#a@b'), ctx), [['#a
|
|
15
|
+
assert.deepStrictEqual(inspect(parser('#a#'), ctx), [['#a'], '#']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser('#a#b'), ctx), [['#a'], '#b']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('#a#b#c'), ctx), [['#a'], '#b#c']);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser('#a@b'), ctx), [['#a'], '@b']);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser('#@'), ctx), [['#', '@'], '']);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser('#@a'), ctx), [['#', '<a class="account" href="/@a">@a</a>'], '']);
|
|
19
21
|
assert.deepStrictEqual(inspect(parser('#\\'), ctx), [['#'], '\\']);
|
|
20
22
|
assert.deepStrictEqual(inspect(parser('#\\ '), ctx), [['#'], '\\ ']);
|
|
21
23
|
assert.deepStrictEqual(inspect(parser('#\\\n'), ctx), [['#'], '\\\n']);
|
|
@@ -33,12 +35,8 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
|
|
|
33
35
|
assert.deepStrictEqual(inspect(parser('#{}}'), ctx), [['#'], '{}}']);
|
|
34
36
|
assert.deepStrictEqual(inspect(parser('#{#}'), ctx), [['#'], '{#}']);
|
|
35
37
|
assert.deepStrictEqual(inspect(parser('#{a}'), ctx), [['#'], '{a}']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser('#12345a'), ctx), [['#12345a'], '']);
|
|
36
39
|
assert.deepStrictEqual(inspect(parser('# '), ctx), [['#'], ' ']);
|
|
37
|
-
assert.deepStrictEqual(inspect(parser('a#1'), ctx), [['a#1'], '']);
|
|
38
|
-
assert.deepStrictEqual(inspect(parser('a#b'), ctx), [['a#b'], '']);
|
|
39
|
-
assert.deepStrictEqual(inspect(parser('a##1'), ctx), [['a##1'], '']);
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('a##b'), ctx), [['a##b'], '']);
|
|
41
|
-
assert.deepStrictEqual(inspect(parser('あ#b'), ctx), [['あ#b'], '']);
|
|
42
40
|
assert.deepStrictEqual(inspect(parser(' #a'), ctx), undefined);
|
|
43
41
|
});
|
|
44
42
|
|
|
@@ -66,7 +64,8 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
|
|
|
66
64
|
assert.deepStrictEqual(inspect(parser(`#a'0`), ctx), [[`<a class="hashtag" href="/hashtags/a'0">#a'0</a>`], '']);
|
|
67
65
|
assert.deepStrictEqual(inspect(parser(`#a'_b`), ctx), [[`<a class="hashtag" href="/hashtags/a">#a</a>`], `'_b`]);
|
|
68
66
|
assert.deepStrictEqual(inspect(parser(`#a_'b`), ctx), [[`<a class="hashtag" href="/hashtags/a">#a</a>`], `_'b`]);
|
|
69
|
-
assert.deepStrictEqual(inspect(parser(
|
|
67
|
+
assert.deepStrictEqual(inspect(parser('#1234a'), ctx), [['<a class="hashtag" href="/hashtags/1234a">#1234a</a>'], '']);
|
|
68
|
+
assert.deepStrictEqual(inspect(parser('#a+b'), ctx), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '+b']);
|
|
70
69
|
});
|
|
71
70
|
|
|
72
71
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AutolinkParser } from '../../inline';
|
|
2
2
|
import { State, Backtrack } from '../../context';
|
|
3
|
-
import { union, state, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
|
|
3
|
+
import { union, state, constraint, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
|
|
4
4
|
import { unsafelink } from '../link';
|
|
5
5
|
import { str } from '../../source';
|
|
6
6
|
import { define } from 'typed-dom/dom';
|
|
@@ -12,11 +12,14 @@ export const emoji = String.raw`\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Em
|
|
|
12
12
|
|
|
13
13
|
export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
|
|
14
14
|
open(
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
new RegExp([
|
|
16
|
+
/(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source,
|
|
17
|
+
].join('').replace(/emoji/g, emoji), 'yu'),
|
|
18
|
+
verify(
|
|
19
|
+
str(new RegExp([
|
|
20
|
+
/(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji))+(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
|
|
21
|
+
].join('').replace(/emoji/g, emoji), 'yu')),
|
|
22
|
+
([source]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(source)),
|
|
20
23
|
false,
|
|
21
24
|
[3 | Backtrack.autolink]),
|
|
22
25
|
union([
|
|
@@ -1,99 +1,97 @@
|
|
|
1
|
-
import {
|
|
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(
|
|
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'
|
|
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[]()<>%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>'
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('http://[::]'), ctx), [['<a class="url" href="http://[::]" target="_blank">http://[::]</a>'], '']);
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('
|
|
35
|
-
assert.deepStrictEqual(inspect(parser('
|
|
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[]()<>%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>'], '
|
|
42
|
-
assert.deepStrictEqual(inspect(parser('http://host.\n'), 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.\\ '), 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>'], '
|
|
48
|
-
assert.deepStrictEqual(inspect(parser('http://host.\\\n'), 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" target="_blank">http://host</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>'
|
|
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&" target="_blank">http://host&</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?&hl" target="_blank">http://host?&hl</a>'
|
|
91
|
-
assert.deepStrictEqual(inspect(parser('http://host?&hl;&hl;'), ctx), [['<a class="url" href="http://host?&hl;&hl" target="_blank">http://host?&hl;&hl</a>'
|
|
88
|
+
assert.deepStrictEqual(inspect(parser(' http://host?&hl;'), ctx), [[' ', '<a class="url" href="http://host?&hl" target="_blank">http://host?&hl</a>', ';'], '']);
|
|
89
|
+
assert.deepStrictEqual(inspect(parser(' http://host?&hl;&hl;'), ctx), [[' ', '<a class="url" href="http://host?&hl;&hl" target="_blank">http://host?&hl;&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,17 @@
|
|
|
1
1
|
import { AutolinkParser } from '../../inline';
|
|
2
2
|
import { State, Recursion, Backtrack } from '../../context';
|
|
3
|
-
import { union, tails, some, recursion, precedence, state, constraint,
|
|
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 {
|
|
5
|
+
import { unescsource, str } from '../../source';
|
|
6
6
|
|
|
7
|
-
export const url: AutolinkParser.UrlParser = lazy(() =>
|
|
7
|
+
export const url: AutolinkParser.UrlParser = lazy(() => rewrite(
|
|
8
8
|
open(
|
|
9
|
-
|
|
9
|
+
/(?<![0-9a-z][.+-]?)https?:\/\/(?=[\x21-\x7E])/y,
|
|
10
10
|
precedence(1, some(union([
|
|
11
11
|
verify(bracket, ns => ns.length > 0),
|
|
12
12
|
// 再帰に注意
|
|
13
|
-
some(unescsource,
|
|
14
|
-
]), undefined, [[
|
|
13
|
+
some(unescsource, /[-+*=~^_/,.;:!?]{2}|[-+*=~^_,.;:!?]?(?=[\\"`|\[\](){}<>]|[^\x21-\x7E]|$)/y),
|
|
14
|
+
]), undefined, [[/[^\x21-\x7E]|\$/y, 9]])),
|
|
15
15
|
false,
|
|
16
16
|
[3 | Backtrack.autolink]),
|
|
17
17
|
union([
|
|
@@ -20,24 +20,20 @@ export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'ht
|
|
|
20
20
|
unsafelink,
|
|
21
21
|
false))),
|
|
22
22
|
({ context: { source } }) => [[source]],
|
|
23
|
-
])))
|
|
23
|
+
])));
|
|
24
24
|
|
|
25
|
-
export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() =>
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
]),
|
|
38
|
-
])),
|
|
39
|
-
false,
|
|
40
|
-
[3 | Backtrack.autolink]));
|
|
25
|
+
export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => focus(
|
|
26
|
+
/(?<=^|[\r\n])!?https?:\/\/\S+(?=[^\S\n]*(?=$|\n))/y,
|
|
27
|
+
tails([
|
|
28
|
+
str('!'),
|
|
29
|
+
union([
|
|
30
|
+
constraint(State.autolink, state(State.autolink, convert(
|
|
31
|
+
url => `{ ${url} }`,
|
|
32
|
+
unsafelink,
|
|
33
|
+
false))),
|
|
34
|
+
({ context: { source } }) => [[source]],
|
|
35
|
+
]),
|
|
36
|
+
])));
|
|
41
37
|
|
|
42
38
|
const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => union([
|
|
43
39
|
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,
|
|
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(
|
|
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
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
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
|
-
|
|
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>
|
|
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
|
|
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(
|
|
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'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('*a\\ *'), ctx), [['*', 'a'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('*a\\\n*'), 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', '<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);
|