securemark 0.259.2 → 0.260.2
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 +13 -0
- package/design.md +14 -4
- package/dist/index.js +253 -207
- package/package.json +1 -1
- package/src/combinator/control/constraint/block.ts +2 -3
- package/src/combinator/control/constraint/contract.ts +5 -7
- package/src/combinator/control/constraint/line.ts +1 -2
- package/src/combinator/control/manipulation/convert.ts +1 -2
- package/src/combinator/control/manipulation/fence.ts +1 -2
- package/src/combinator/control/manipulation/match.ts +2 -3
- package/src/combinator/control/manipulation/scope.ts +3 -5
- package/src/combinator/control/manipulation/surround.ts +2 -2
- package/src/combinator/control/monad/bind.ts +2 -3
- package/src/combinator/data/parser/context.ts +20 -22
- package/src/combinator/data/parser/inits.ts +1 -2
- package/src/combinator/data/parser/sequence.ts +1 -2
- package/src/combinator/data/parser/some.ts +1 -2
- package/src/parser/api/parse.test.ts +19 -19
- package/src/parser/autolink.test.ts +6 -6
- package/src/parser/block/blockquote.test.ts +8 -8
- package/src/parser/block/blockquote.ts +3 -3
- package/src/parser/block/codeblock.test.ts +4 -4
- package/src/parser/block/dlist.test.ts +1 -1
- package/src/parser/block/dlist.ts +2 -2
- package/src/parser/block/extension/figure.test.ts +1 -1
- package/src/parser/block/extension/table.ts +3 -3
- package/src/parser/block/heading.test.ts +5 -5
- package/src/parser/block/ilist.ts +1 -1
- package/src/parser/block/olist.test.ts +1 -1
- package/src/parser/block/olist.ts +1 -1
- package/src/parser/block/paragraph.test.ts +14 -14
- package/src/parser/block/reply/cite.test.ts +11 -11
- package/src/parser/block/reply/cite.ts +1 -1
- package/src/parser/block/reply/quote.test.ts +3 -3
- package/src/parser/block/reply/quote.ts +1 -1
- package/src/parser/block/reply.test.ts +8 -8
- package/src/parser/block/sidefence.test.ts +6 -6
- package/src/parser/block/sidefence.ts +1 -1
- package/src/parser/block/table.ts +4 -4
- package/src/parser/block/ulist.test.ts +1 -1
- package/src/parser/block/ulist.ts +2 -2
- package/src/parser/block.ts +1 -1
- package/src/parser/context.ts +8 -7
- package/src/parser/inline/annotation.test.ts +3 -3
- package/src/parser/inline/autolink/account.test.ts +11 -11
- package/src/parser/inline/autolink/account.ts +4 -2
- package/src/parser/inline/autolink/anchor.test.ts +9 -9
- package/src/parser/inline/autolink/anchor.ts +14 -11
- package/src/parser/inline/autolink/channel.test.ts +3 -3
- package/src/parser/inline/autolink/hashnum.ts +4 -2
- package/src/parser/inline/autolink/hashtag.test.ts +20 -20
- package/src/parser/inline/autolink/hashtag.ts +4 -2
- package/src/parser/inline/autolink/url.test.ts +55 -55
- package/src/parser/inline/html.test.ts +0 -2
- package/src/parser/inline/html.ts +1 -1
- package/src/parser/inline/link.test.ts +110 -110
- package/src/parser/inline/link.ts +30 -28
- package/src/parser/inline/media.test.ts +1 -0
- package/src/parser/inline/media.ts +1 -1
- package/src/parser/inline/reference.test.ts +3 -3
- package/src/parser/inline/ruby.ts +1 -1
- package/src/parser/inline.test.ts +51 -51
- package/src/parser/source/escapable.ts +1 -1
- package/src/parser/source/str.ts +4 -4
- package/src/parser/source/text.ts +2 -3
- package/src/parser/source/unescapable.ts +1 -1
- package/src/renderer/render/media/pdf.ts +1 -0
- package/src/renderer/render/media/twitter.ts +7 -1
- package/src/util/info.ts +2 -4
|
@@ -81,7 +81,7 @@ describe('Unit: parser/block/olist', () => {
|
|
|
81
81
|
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3')), [['<ol><li>1<ol><li>2</li><li>3</li></ol></li></ol>'], '']);
|
|
82
82
|
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3')), [['<ol><li>1<ol><li>2<ol><li>3</li></ol></li></ol></li></ol>'], '']);
|
|
83
83
|
assert.deepStrictEqual(inspect(parser('0. 1\n 0. 2\n 0. 3')), [['<ol><li>1<ol><li>2</li></ol></li><li><span class="invalid"> 0. 3</span></li></ol>'], '']);
|
|
84
|
-
assert.deepStrictEqual(inspect(parser('0. !http://host')), [['<ol><li>!<a href="http://host" target="_blank">http://host</a></li></ol>'], '']);
|
|
84
|
+
assert.deepStrictEqual(inspect(parser('0. !http://host')), [['<ol><li>!<a class="url" href="http://host" target="_blank">http://host</a></li></ol>'], '']);
|
|
85
85
|
});
|
|
86
86
|
|
|
87
87
|
it('index', () => {
|
|
@@ -36,7 +36,7 @@ export const olist_: OListParser = lazy(() => block(union([
|
|
|
36
36
|
])));
|
|
37
37
|
|
|
38
38
|
const list = (type: string, form: string): OListParser.ListParser => fmap(
|
|
39
|
-
some(creation(union([
|
|
39
|
+
some(creation(1, false, union([
|
|
40
40
|
indexee(fmap(fallback(
|
|
41
41
|
inits([
|
|
42
42
|
line(open(heads[form], subsequence([checkbox, trimBlank(some(union([indexer, inline])))]), true)),
|
|
@@ -37,23 +37,23 @@ describe('Unit: parser/block/paragraph', () => {
|
|
|
37
37
|
});
|
|
38
38
|
|
|
39
39
|
it('anchor', () => {
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('>>1 a\nb')), [['<p><a href="?at=1"
|
|
41
|
-
assert.deepStrictEqual(inspect(parser('>>1 a\n>>2')), [['<p><a href="?at=1"
|
|
42
|
-
assert.deepStrictEqual(inspect(parser('>>1 a\n>>b')), [['<p><a href="?at=1"
|
|
43
|
-
assert.deepStrictEqual(inspect(parser('>>1 a\n>> b')), [['<p><a href="?at=1"
|
|
44
|
-
assert.deepStrictEqual(inspect(parser('>>11.')), [['<p><a href="?at=11"
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('>>11 a')), [['<p><a href="?at=11"
|
|
46
|
-
assert.deepStrictEqual(inspect(parser('>>>11 a')), [['<p>><a href="?at=11"
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('>> a\n>>1')), [['<p>>> a<br><a href="?at=1"
|
|
40
|
+
assert.deepStrictEqual(inspect(parser('>>1 a\nb')), [['<p><a class="anchor" href="?at=1">>>1</a> a<br>b</p>'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser('>>1 a\n>>2')), [['<p><a class="anchor" href="?at=1">>>1</a> a<br><a class="anchor" href="?at=2">>>2</a></p>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser('>>1 a\n>>b')), [['<p><a class="anchor" href="?at=1">>>1</a> a<br><a class="anchor" href="?at=b">>>b</a></p>'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser('>>1 a\n>> b')), [['<p><a class="anchor" href="?at=1">>>1</a> a<br>>> b</p>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser('>>11.')), [['<p><a class="anchor" href="?at=11">>>11</a>.</p>'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser('>>11 a')), [['<p><a class="anchor" href="?at=11">>>11</a> a</p>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser('>>>11 a')), [['<p>><a class="anchor" href="?at=11">>>11</a> a</p>'], '']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser('>> a\n>>1')), [['<p>>> a<br><a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
48
48
|
assert.deepStrictEqual(inspect(parser('a>>1')), [['<p>a>>1</p>'], '']);
|
|
49
49
|
assert.deepStrictEqual(inspect(parser('ab>>1')), [['<p>ab>>1</p>'], '']);
|
|
50
|
-
assert.deepStrictEqual(inspect(parser('a >>1')), [['<p>a <a href="?at=1"
|
|
51
|
-
assert.deepStrictEqual(inspect(parser('a\n>>1')), [['<p>a<br><a href="?at=1"
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('a\n>>1\nb')), [['<p>a<br><a href="?at=1"
|
|
50
|
+
assert.deepStrictEqual(inspect(parser('a >>1')), [['<p>a <a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser('a\n>>1')), [['<p>a<br><a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser('a\n>>1\nb')), [['<p>a<br><a class="anchor" href="?at=1">>>1</a><br>b</p>'], '']);
|
|
53
53
|
assert.deepStrictEqual(inspect(parser('a\n>> b\nc')), [['<p>a<br>>> b<br>c</p>'], '']);
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('\t>>1')), [['<p>\t<a href="?at=1"
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('\t>>>1')), [['<p>\t><a href="?at=1"
|
|
56
|
-
assert.deepStrictEqual(inspect(parser('あ>>1')), [['<p>あ<a href="?at=1"
|
|
54
|
+
assert.deepStrictEqual(inspect(parser('\t>>1')), [['<p>\t<a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser('\t>>>1')), [['<p>\t><a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser('あ>>1')), [['<p>あ<a class="anchor" href="?at=1">>>1</a></p>'], '']);
|
|
57
57
|
});
|
|
58
58
|
|
|
59
59
|
it('comment', () => {
|
|
@@ -27,17 +27,17 @@ describe('Unit: parser/block/reply/cite', () => {
|
|
|
27
27
|
});
|
|
28
28
|
|
|
29
29
|
it('valid', () => {
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('>>0')), [['<span class="cite">><a href="?at=0"
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('>>0 ')), [['<span class="cite">><a href="?at=0"
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('>>0\n')), [['<span class="cite">><a href="?at=0"
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('>>>0')), [['<span class="cite">>><a href="?at=0"
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('>>0\n1')), [['<span class="cite">><a href="?at=0"
|
|
35
|
-
assert.deepStrictEqual(inspect(parser('>>0\n>1')), [['<span class="cite">><a href="?at=0"
|
|
36
|
-
assert.deepStrictEqual(inspect(parser('>>0\n>>')), [['<span class="cite">><a href="?at=0"
|
|
37
|
-
assert.deepStrictEqual(inspect(parser('>>0\n>>1')), [['<span class="cite">><a href="?at=0"
|
|
38
|
-
assert.deepStrictEqual(inspect(parser('>>0\n>>>1')), [['<span class="cite">><a href="?at=0"
|
|
39
|
-
assert.deepStrictEqual(inspect(parser('>>>0\n>>')), [['<span class="cite">>><a href="?at=0"
|
|
40
|
-
assert.deepStrictEqual(inspect(parser('>>>0\n>>1')), [['<span class="cite">>><a href="?at=0"
|
|
30
|
+
assert.deepStrictEqual(inspect(parser('>>0')), [['<span class="cite">><a class="anchor" href="?at=0" data-depth="1">>0</a></span>', '<br>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser('>>0 ')), [['<span class="cite">><a class="anchor" href="?at=0" data-depth="1">>0</a></span>', '<br>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser('>>0\n')), [['<span class="cite">><a class="anchor" href="?at=0" data-depth="1">>0</a></span>', '<br>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser('>>>0')), [['<span class="cite">>><a class="anchor" href="?at=0" data-depth="2">>0</a></span>', '<br>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser('>>0\n1')), [['<span class="cite">><a class="anchor" href="?at=0" data-depth="1">>0</a></span>', '<br>'], '1']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser('>>0\n>1')), [['<span class="cite">><a class="anchor" href="?at=0" data-depth="1">>0</a></span>', '<br>'], '>1']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser('>>0\n>>')), [['<span class="cite">><a class="anchor" href="?at=0" data-depth="1">>0</a></span>', '<br>'], '>>']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser('>>0\n>>1')), [['<span class="cite">><a class="anchor" href="?at=0" data-depth="1">>0</a></span>', '<br>', '<span class="cite">><a class="anchor" href="?at=1" data-depth="1">>1</a></span>', '<br>'], '']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser('>>0\n>>>1')), [['<span class="cite">><a class="anchor" href="?at=0" data-depth="1">>0</a></span>', '<br>', '<span class="cite">>><a class="anchor" href="?at=1" data-depth="2">>1</a></span>', '<br>'], '']);
|
|
39
|
+
assert.deepStrictEqual(inspect(parser('>>>0\n>>')), [['<span class="cite">>><a class="anchor" href="?at=0" data-depth="2">>0</a></span>', '<br>'], '>>']);
|
|
40
|
+
assert.deepStrictEqual(inspect(parser('>>>0\n>>1')), [['<span class="cite">>><a class="anchor" href="?at=0" data-depth="2">>0</a></span>', '<br>', '<span class="cite">><a class="anchor" href="?at=1" data-depth="1">>1</a></span>', '<br>'], '']);
|
|
41
41
|
assert.deepStrictEqual(inspect(parser('>>.')), [['<span class="cite">><a class="anchor" data-depth="1">>.</a></span>', '<br>'], '']);
|
|
42
42
|
assert.deepStrictEqual(inspect(parser('>>#')), [['<span class="cite">><a class="anchor" data-depth="1">>#</a></span>', '<br>'], '']);
|
|
43
43
|
assert.deepStrictEqual(inspect(parser('>>#a')), [['<span class="cite">><a class="anchor" data-depth="1">>#a</a></span>', '<br>'], '']);
|
|
@@ -4,7 +4,7 @@ import { anchor } from '../../inline/autolink/anchor';
|
|
|
4
4
|
import { str } from '../../source';
|
|
5
5
|
import { html, define, defrag } from 'typed-dom/dom';
|
|
6
6
|
|
|
7
|
-
export const cite: ReplyParser.CiteParser = creation(line(fmap(validate(
|
|
7
|
+
export const cite: ReplyParser.CiteParser = creation(1, false, line(fmap(validate(
|
|
8
8
|
'>>',
|
|
9
9
|
reverse(tails([
|
|
10
10
|
str(/^>*(?=>>[^>\s]+[^\S\n]*(?:$|\n))/),
|
|
@@ -47,11 +47,11 @@ describe('Unit: parser/block/reply/quote', () => {
|
|
|
47
47
|
assert.deepStrictEqual(inspect(parser('> 0\n>> 1')), [['<span class="quote">> 0<br>>> 1</span>', '<br>'], '']);
|
|
48
48
|
assert.deepStrictEqual(inspect(parser('>> 0\n> 1')), [['<span class="quote">>> 0<br>> 1</span>', '<br>'], '']);
|
|
49
49
|
assert.deepStrictEqual(inspect(parser('> \\')), [['<span class="quote">> \\</span>', '<br>'], '']);
|
|
50
|
-
assert.deepStrictEqual(inspect(parser('> >>0\n> > b')), [['<span class="quote">> <a href="?at=0"
|
|
51
|
-
assert.deepStrictEqual(inspect(parser('> >>0\n> > b\n> c')), [['<span class="quote">> <a href="?at=0"
|
|
50
|
+
assert.deepStrictEqual(inspect(parser('> >>0\n> > b')), [['<span class="quote">> <a class="anchor" href="?at=0">>>0</a><br>> > b</span>', '<br>'], '']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser('> >>0\n> > b\n> c')), [['<span class="quote">> <a class="anchor" href="?at=0">>>0</a><br>> > b<br>> c</span>', '<br>'], '']);
|
|
52
52
|
assert.deepStrictEqual(inspect(parser('> > a\n> > b\n> > c')), [['<span class="quote">> > a<br>> > b<br>> > c</span>', '<br>'], '']);
|
|
53
53
|
assert.deepStrictEqual(inspect(parser('> > > a\n> > > b')), [['<span class="quote">> > > a<br>> > > b</span>', '<br>'], '']);
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('> #a')), [['<span class="quote">> <a href="/hashtags/a"
|
|
54
|
+
assert.deepStrictEqual(inspect(parser('> #a')), [['<span class="quote">> <a class="hashtag" href="/hashtags/a">#a</a></span>', '<br>'], '']);
|
|
55
55
|
assert.deepStrictEqual(inspect(parser('> $-a, $-b')), [['<span class="quote">> $-a, $-b</span>', '<br>'], '']);
|
|
56
56
|
assert.deepStrictEqual(inspect(parser('> $a=b$')), [['<span class="quote">> <span class="math" translate="no" data-src="$a=b$">$a=b$</span></span>', '<br>'], '']);
|
|
57
57
|
assert.deepStrictEqual(inspect(parser('> ${a}$')), [['<span class="quote">> <span class="math" translate="no" data-src="${a}$">${a}$</span></span>', '<br>'], '']);
|
|
@@ -8,7 +8,7 @@ import { html, defrag } from 'typed-dom/dom';
|
|
|
8
8
|
|
|
9
9
|
export const syntax = /^>+(?=[^\S\n])|^>(?=[^\s>])|^>+(?=[^\s>])(?![0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:]))/;
|
|
10
10
|
|
|
11
|
-
export const quote: ReplyParser.QuoteParser = lazy(() => creation(block(fmap(validate(
|
|
11
|
+
export const quote: ReplyParser.QuoteParser = lazy(() => creation(1, false, block(fmap(validate(
|
|
12
12
|
'>',
|
|
13
13
|
union([
|
|
14
14
|
rewrite(
|
|
@@ -7,14 +7,14 @@ describe('Unit: parser/block/reply', () => {
|
|
|
7
7
|
const parser = (source: string) => some(reply)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('basic', () => {
|
|
10
|
-
assert.deepStrictEqual(inspect(parser('>>1')), [['<p><span class="cite">><a href="?at=1"
|
|
11
|
-
assert.deepStrictEqual(inspect(parser('>>1\na')), [['<p><span class="cite">><a href="?at=1"
|
|
12
|
-
assert.deepStrictEqual(inspect(parser('>>1\na\n>>2')), [['<p><span class="cite">><a href="?at=1"
|
|
13
|
-
assert.deepStrictEqual(inspect(parser('>>1\n>>2')), [['<p><span class="cite">><a href="?at=1"
|
|
14
|
-
assert.deepStrictEqual(inspect(parser('>>1\n> a')), [['<p><span class="cite">><a href="?at=1"
|
|
15
|
-
assert.deepStrictEqual(inspect(parser('>>1\n> a\nb')), [['<p><span class="cite">><a href="?at=1"
|
|
16
|
-
assert.deepStrictEqual(inspect(parser('>>1\n> a\n>>2')), [['<p><span class="cite">><a href="?at=1"
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('>>1\n> a\n>> b')), [['<p><span class="cite">><a href="?at=1"
|
|
10
|
+
assert.deepStrictEqual(inspect(parser('>>1')), [['<p><span class="cite">><a class="anchor" href="?at=1" data-depth="1">>1</a></span></p>'], '']);
|
|
11
|
+
assert.deepStrictEqual(inspect(parser('>>1\na')), [['<p><span class="cite">><a class="anchor" href="?at=1" data-depth="1">>1</a></span><br>a</p>'], '']);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser('>>1\na\n>>2')), [['<p><span class="cite">><a class="anchor" href="?at=1" data-depth="1">>1</a></span><br>a<br><a class="anchor" href="?at=2">>>2</a></p>'], '']);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser('>>1\n>>2')), [['<p><span class="cite">><a class="anchor" href="?at=1" data-depth="1">>1</a></span><br><span class="cite">><a class="anchor" href="?at=2" data-depth="1">>2</a></span></p>'], '']);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser('>>1\n> a')), [['<p><span class="cite">><a class="anchor" href="?at=1" data-depth="1">>1</a></span><br><span class="quote">> a</span></p>'], '']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser('>>1\n> a\nb')), [['<p><span class="cite">><a class="anchor" href="?at=1" data-depth="1">>1</a></span><br><span class="quote">> a</span><br>b</p>'], '']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser('>>1\n> a\n>>2')), [['<p><span class="cite">><a class="anchor" href="?at=1" data-depth="1">>1</a></span><br><span class="quote">> a</span><br><span class="cite">><a class="anchor" href="?at=2" data-depth="1">>2</a></span></p>'], '']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('>>1\n> a\n>> b')), [['<p><span class="cite">><a class="anchor" href="?at=1" data-depth="1">>1</a></span><br><span class="quote">> a<br>>> b</span></p>'], '']);
|
|
18
18
|
});
|
|
19
19
|
|
|
20
20
|
});
|
|
@@ -40,12 +40,12 @@ describe('Unit: parser/block/sidefence', () => {
|
|
|
40
40
|
assert.deepStrictEqual(inspect(parser('|\n a')), undefined);
|
|
41
41
|
assert.deepStrictEqual(inspect(parser('|\n|')), [['<blockquote class="invalid"><pre><br></pre></blockquote>'], '']);
|
|
42
42
|
assert.deepStrictEqual(inspect(parser('|\n| a')), [['<blockquote class="invalid"><pre><br>a</pre></blockquote>'], '']);
|
|
43
|
-
assert.deepStrictEqual(inspect(parser('| http://host')), [['<blockquote class="invalid"><pre><a href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
|
|
44
|
-
assert.deepStrictEqual(inspect(parser('| !http://host')), [['<blockquote class="invalid"><pre>!<a href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('| #a')), [['<blockquote class="invalid"><pre><a href="/hashtags/a"
|
|
46
|
-
assert.deepStrictEqual(inspect(parser('| @a#b')), [['<blockquote class="invalid"><pre><a href="/@a?ch=b"
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('| >>1\n| | b')), [['<blockquote class="invalid"><pre><a href="?at=1"
|
|
48
|
-
assert.deepStrictEqual(inspect(parser('| >>1\n| | b\n| c')), [['<blockquote class="invalid"><pre><a href="?at=1"
|
|
43
|
+
assert.deepStrictEqual(inspect(parser('| http://host')), [['<blockquote class="invalid"><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser('| !http://host')), [['<blockquote class="invalid"><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser('| #a')), [['<blockquote class="invalid"><pre><a class="hashtag" href="/hashtags/a">#a</a></pre></blockquote>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser('| @a#b')), [['<blockquote class="invalid"><pre><a class="channel" href="/@a?ch=b">@a#b</a></pre></blockquote>'], '']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser('| >>1\n| | b')), [['<blockquote class="invalid"><pre><a class="anchor" href="?at=1">>>1</a><br>| b</pre></blockquote>'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser('| >>1\n| | b\n| c')), [['<blockquote class="invalid"><pre><a class="anchor" href="?at=1">>>1</a><br>| b<br>c</pre></blockquote>'], '']);
|
|
49
49
|
});
|
|
50
50
|
|
|
51
51
|
it('nest', () => {
|
|
@@ -20,7 +20,7 @@ const opener = /^(?=\|\|+(?:$|\s))/;
|
|
|
20
20
|
const unindent = (source: string) => source.replace(/(^|\n)\|(?:[^\S\n]|(?=\|*(?:$|\s)))|\n$/g, '$1');
|
|
21
21
|
|
|
22
22
|
const source: SidefenceParser.SourceParser = lazy(() => fmap(
|
|
23
|
-
some(creation(union([
|
|
23
|
+
some(creation(1, false, union([
|
|
24
24
|
focus(
|
|
25
25
|
/^(?:\|\|+(?:[^\S\n][^\n]*)?(?:$|\n))+/,
|
|
26
26
|
convert(unindent, source)),
|
|
@@ -25,7 +25,7 @@ export const table: TableParser = lazy(() => block(fmap(validate(
|
|
|
25
25
|
]),
|
|
26
26
|
])));
|
|
27
27
|
|
|
28
|
-
const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean): RowParser<P> => creation(fallback(fmap(
|
|
28
|
+
const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean): RowParser<P> => creation(1, false, fallback(fmap(
|
|
29
29
|
line(surround(/^(?=\|)/, some(union([parser])), /^[|\\]?\s*$/, optional)),
|
|
30
30
|
es => [html('tr', es)]),
|
|
31
31
|
rewrite(contentline, ({ source }) => [[
|
|
@@ -37,7 +37,7 @@ const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean):
|
|
|
37
37
|
}, [html('td', source.replace('\n', ''))])
|
|
38
38
|
], ''])));
|
|
39
39
|
|
|
40
|
-
const align: AlignParser = creation(fmap(open(
|
|
40
|
+
const align: AlignParser = creation(1, false, fmap(open(
|
|
41
41
|
'|',
|
|
42
42
|
union([
|
|
43
43
|
focus(/^:-+:/, () => [['center'], '']),
|
|
@@ -52,11 +52,11 @@ const cell: CellParser = surround(
|
|
|
52
52
|
some(union([inline]), /^\|/, [[/^[|\\]?\s*$/, 9]]),
|
|
53
53
|
/^[^|]*/, true);
|
|
54
54
|
|
|
55
|
-
const head: CellParser.HeadParser = creation(fmap(
|
|
55
|
+
const head: CellParser.HeadParser = creation(1, false, fmap(
|
|
56
56
|
cell,
|
|
57
57
|
ns => [html('th', trimNode(defrag(ns)))]));
|
|
58
58
|
|
|
59
|
-
const data: CellParser.DataParser = creation(fmap(
|
|
59
|
+
const data: CellParser.DataParser = creation(1, false, fmap(
|
|
60
60
|
cell,
|
|
61
61
|
ns => [html('td', trimNode(defrag(ns)))]));
|
|
62
62
|
|
|
@@ -56,7 +56,7 @@ describe('Unit: parser/block/ulist', () => {
|
|
|
56
56
|
assert.deepStrictEqual(inspect(parser('- 1\n 0.')), [['<ul><li>1<ol><li></li></ol></li></ul>'], '']);
|
|
57
57
|
assert.deepStrictEqual(inspect(parser('- 1\n 0. ')), [['<ul><li>1<ol><li></li></ol></li></ul>'], '']);
|
|
58
58
|
assert.deepStrictEqual(inspect(parser('- 1\n 0. 2')), [['<ul><li>1<ol><li>2</li></ol></li></ul>'], '']);
|
|
59
|
-
assert.deepStrictEqual(inspect(parser('- !http://host')), [['<ul><li>!<a href="http://host" target="_blank">http://host</a></li></ul>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser('- !http://host')), [['<ul><li>!<a class="url" href="http://host" target="_blank">http://host</a></li></ul>'], '']);
|
|
60
60
|
});
|
|
61
61
|
|
|
62
62
|
it('checkbox', () => {
|
|
@@ -15,7 +15,7 @@ export const ulist: UListParser = lazy(() => block(validate(
|
|
|
15
15
|
|
|
16
16
|
export const ulist_: UListParser = lazy(() => block(fmap(validate(
|
|
17
17
|
/^-(?=$|\s)/,
|
|
18
|
-
some(creation(union([
|
|
18
|
+
some(creation(1, false, union([
|
|
19
19
|
indexee(fmap(fallback(
|
|
20
20
|
inits([
|
|
21
21
|
line(open(/^-(?:$|\s)/, subsequence([checkbox, trimBlank(some(union([indexer, inline])))]), true)),
|
|
@@ -26,7 +26,7 @@ export const ulist_: UListParser = lazy(() => block(fmap(validate(
|
|
|
26
26
|
])))),
|
|
27
27
|
es => [format(html('ul', es))])));
|
|
28
28
|
|
|
29
|
-
export const checkbox = creation(focus(
|
|
29
|
+
export const checkbox = creation(1, false, focus(
|
|
30
30
|
/^\[[xX ]\](?=$|\s)/,
|
|
31
31
|
({ source }) => [[
|
|
32
32
|
html('span', { class: 'checkbox' }, source[1].trimStart() ? '☑' : '☐'),
|
package/src/parser/block.ts
CHANGED
|
@@ -35,7 +35,7 @@ export import BlockquoteParser = BlockParser.BlockquoteParser;
|
|
|
35
35
|
export import ReplyParser = BlockParser.ReplyParser;
|
|
36
36
|
export import ParagraphParser = BlockParser.ParagraphParser;
|
|
37
37
|
|
|
38
|
-
export const block: BlockParser = creation(error(
|
|
38
|
+
export const block: BlockParser = creation(1, false, error(
|
|
39
39
|
reset({ resources: { clock: 50 * 1000, recursion: 20 } },
|
|
40
40
|
union([
|
|
41
41
|
emptyline,
|
package/src/parser/context.ts
CHANGED
|
@@ -16,13 +16,14 @@ export const enum Syntax {
|
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
export const enum State {
|
|
19
|
-
annotation = 1 <<
|
|
20
|
-
reference = 1 <<
|
|
21
|
-
index = 1 <<
|
|
22
|
-
label = 1 <<
|
|
23
|
-
link = 1 <<
|
|
24
|
-
media = 1 <<
|
|
25
|
-
autolink = 1 <<
|
|
19
|
+
annotation = 1 << 7,
|
|
20
|
+
reference = 1 << 6,
|
|
21
|
+
index = 1 << 5,
|
|
22
|
+
label = 1 << 4,
|
|
23
|
+
link = 1 << 3,
|
|
24
|
+
media = 1 << 2,
|
|
25
|
+
autolink = 1 << 1,
|
|
26
|
+
shortcut = 1 << 0,
|
|
26
27
|
none = 0,
|
|
27
28
|
linkable = 0
|
|
28
29
|
| State.annotation
|
|
@@ -45,9 +45,9 @@ describe('Unit: parser/inline/annotation', () => {
|
|
|
45
45
|
it('nest', () => {
|
|
46
46
|
assert.deepStrictEqual(inspect(parser('((<bdi>))')), [['<sup class="annotation"><span><span class="invalid"><bdi></span></span></sup>'], '']);
|
|
47
47
|
assert.deepStrictEqual(inspect(parser('((`a`))')), [['<sup class="annotation"><span><code data-src="`a`">a</code></span></sup>'], '']);
|
|
48
|
-
assert.deepStrictEqual(inspect(parser('((@a))')), [['<sup class="annotation"><span><a
|
|
49
|
-
assert.deepStrictEqual(inspect(parser('((http://host))')), [['<sup class="annotation"><span><a href="http://host" target="_blank">http://host</a></span></sup>'], '']);
|
|
50
|
-
assert.deepStrictEqual(inspect(parser('((![]{a}))')), [['<sup class="annotation"><span>!<a href="a">a</a></span></sup>'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser('((@a))')), [['<sup class="annotation"><span><a class="account" href="/@a">@a</a></span></sup>'], '']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser('((http://host))')), [['<sup class="annotation"><span><a class="url" href="http://host" target="_blank">http://host</a></span></sup>'], '']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser('((![]{a}))')), [['<sup class="annotation"><span>!<a class="url" href="a">a</a></span></sup>'], '']);
|
|
51
51
|
assert.deepStrictEqual(inspect(parser('(((a)))')), [['<sup class="annotation"><span>(a)</span></sup>'], '']);
|
|
52
52
|
assert.deepStrictEqual(inspect(parser('((((a))))')), [['<sup class="annotation"><span><span class="paren">((a))</span></span></sup>'], '']);
|
|
53
53
|
assert.deepStrictEqual(inspect(parser('(([[a]]))')), [['<sup class="annotation"><span><sup class="reference"><span>a</span></sup></span></sup>'], '']);
|
|
@@ -26,17 +26,17 @@ describe('Unit: parser/inline/autolink/account', () => {
|
|
|
26
26
|
});
|
|
27
27
|
|
|
28
28
|
it('valid', () => {
|
|
29
|
-
assert.deepStrictEqual(inspect(parser('@a')), [['<a
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('@A')), [['<a
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('@a_b')), [['<a
|
|
32
|
-
assert.deepStrictEqual(inspect(parser('@a__b')), [['<a
|
|
33
|
-
assert.deepStrictEqual(inspect(parser('@a-')), [['<a
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('@a-b')), [['<a href="/@a-b"
|
|
35
|
-
assert.deepStrictEqual(inspect(parser('@a--b')), [['<a
|
|
36
|
-
assert.deepStrictEqual(inspect(parser('@http://host')), [['<a
|
|
37
|
-
assert.deepStrictEqual(inspect(parser('@ttp://host')), [['<a
|
|
38
|
-
assert.deepStrictEqual(inspect(parser('@domain/a')), [['<a href="https://domain/@a" target="_blank"
|
|
39
|
-
assert.deepStrictEqual(inspect(parser('@domain.co.jp/a')), [['<a href="https://domain.co.jp/@a" target="_blank"
|
|
29
|
+
assert.deepStrictEqual(inspect(parser('@a')), [['<a class="account" href="/@a">@a</a>'], '']);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser('@A')), [['<a class="account" href="/@A">@A</a>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser('@a_b')), [['<a class="account" href="/@a">@a</a>'], '_b']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser('@a__b')), [['<a class="account" href="/@a">@a</a>'], '__b']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser('@a-')), [['<a class="account" href="/@a">@a</a>'], '-']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser('@a-b')), [['<a class="account" href="/@a-b">@a-b</a>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser('@a--b')), [['<a class="account" href="/@a">@a</a>'], '--b']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser('@http://host')), [['<a class="account" href="/@http">@http</a>'], '://host']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser('@ttp://host')), [['<a class="account" href="/@ttp">@ttp</a>'], '://host']);
|
|
38
|
+
assert.deepStrictEqual(inspect(parser('@domain/a')), [['<a class="account" href="https://domain/@a" target="_blank">@domain/a</a>'], '']);
|
|
39
|
+
assert.deepStrictEqual(inspect(parser('@domain.co.jp/a')), [['<a class="account" href="https://domain.co.jp/@a" target="_blank">@domain.co.jp/a</a>'], '']);
|
|
40
40
|
});
|
|
41
41
|
|
|
42
42
|
});
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { AutolinkParser } from '../../inline';
|
|
2
|
-
import { union, tails, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
|
|
2
|
+
import { union, constraint, tails, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
|
|
3
3
|
import { unsafelink } from '../link';
|
|
4
4
|
import { str } from '../../source';
|
|
5
|
+
import { State } from '../../context';
|
|
5
6
|
import { define } from 'typed-dom/dom';
|
|
6
7
|
|
|
7
8
|
// https://example/@user must be a user page or a redirect page going there.
|
|
8
9
|
|
|
9
10
|
export const account: AutolinkParser.AccountParser = lazy(() => fmap(rewrite(
|
|
11
|
+
constraint(State.shortcut, false,
|
|
10
12
|
open(
|
|
11
13
|
'@',
|
|
12
14
|
tails([
|
|
@@ -16,7 +18,7 @@ export const account: AutolinkParser.AccountParser = lazy(() => fmap(rewrite(
|
|
|
16
18
|
verify(
|
|
17
19
|
str(/^[A-Za-z][0-9A-Za-z]*(?:-[0-9A-Za-z]+)*/),
|
|
18
20
|
([source]) => source.length <= 64),
|
|
19
|
-
])),
|
|
21
|
+
]))),
|
|
20
22
|
convert(
|
|
21
23
|
source =>
|
|
22
24
|
`[${source}]{ ${
|
|
@@ -20,15 +20,15 @@ describe('Unit: parser/inline/autolink/anchor', () => {
|
|
|
20
20
|
});
|
|
21
21
|
|
|
22
22
|
it('valid', () => {
|
|
23
|
-
assert.deepStrictEqual(inspect(parser('>>0')), [['<a href="?at=0"
|
|
24
|
-
assert.deepStrictEqual(inspect(parser('>>a')), [['<a href="?at=a"
|
|
25
|
-
assert.deepStrictEqual(inspect(parser('>>A')), [['<a href="?at=A"
|
|
26
|
-
assert.deepStrictEqual(inspect(parser('>>0-')), [['<a href="?at=0"
|
|
27
|
-
assert.deepStrictEqual(inspect(parser('>>0-a')), [['<a href="?at=0-a"
|
|
28
|
-
assert.deepStrictEqual(inspect(parser('>>0-A')), [['<a href="?at=0-A"
|
|
29
|
-
assert.deepStrictEqual(inspect(parser('>>0--a')), [['<a href="?at=0"
|
|
30
|
-
assert.deepStrictEqual(inspect(parser('>>2000-01-31-23-59-59-999-JST')), [['<a href="?at=2000-01-31-23-59-59-999-JST"
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('>>A/2000-01-31-23-59-59-JST')), [['<a href="/@A/timeline/2000-01-31-23-59-59-JST"
|
|
23
|
+
assert.deepStrictEqual(inspect(parser('>>0')), [['<a class="anchor" href="?at=0">>>0</a>'], '']);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser('>>a')), [['<a class="anchor" href="?at=a">>>a</a>'], '']);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser('>>A')), [['<a class="anchor" href="?at=A">>>A</a>'], '']);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser('>>0-')), [['<a class="anchor" href="?at=0">>>0</a>'], '-']);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser('>>0-a')), [['<a class="anchor" href="?at=0-a">>>0-a</a>'], '']);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser('>>0-A')), [['<a class="anchor" href="?at=0-A">>>0-A</a>'], '']);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser('>>0--a')), [['<a class="anchor" href="?at=0">>>0</a>'], '--a']);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser('>>2000-01-31-23-59-59-999-JST')), [['<a class="anchor" href="?at=2000-01-31-23-59-59-999-JST">>>2000-01-31-23-59-59-999-JST</a>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser('>>A/2000-01-31-23-59-59-JST')), [['<a class="anchor" href="/@A/timeline/2000-01-31-23-59-59-JST">>>A/2000-01-31-23-59-59-JST</a>'], '']);
|
|
32
32
|
});
|
|
33
33
|
|
|
34
34
|
});
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AutolinkParser } from '../../inline';
|
|
2
|
-
import { union, validate, focus, convert, fmap, lazy } from '../../../combinator';
|
|
2
|
+
import { union, constraint, validate, focus, convert, fmap, lazy } from '../../../combinator';
|
|
3
3
|
import { unsafelink } from '../link';
|
|
4
|
+
import { State } from '../../context';
|
|
4
5
|
import { define } from 'typed-dom/dom';
|
|
5
6
|
|
|
6
7
|
// Timeline(pseudonym): user/tid
|
|
@@ -12,14 +13,16 @@ import { define } from 'typed-dom/dom';
|
|
|
12
13
|
// 内部表現はUnixTimeに統一する(時系列順)
|
|
13
14
|
// 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
|
|
14
15
|
|
|
15
|
-
export const anchor: AutolinkParser.AnchorParser = lazy(() => validate('>>', fmap(
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
source
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
16
|
+
export const anchor: AutolinkParser.AnchorParser = lazy(() => validate('>>', fmap(
|
|
17
|
+
constraint(State.shortcut, false,
|
|
18
|
+
focus(
|
|
19
|
+
/^>>(?:[A-Za-z][0-9A-Za-z]*(?:-[0-9A-Za-z]+)*\/)?[0-9A-Za-z]+(?:-[0-9A-Za-z]+)*(?![0-9A-Za-z@#:])/,
|
|
20
|
+
convert(
|
|
21
|
+
source =>
|
|
22
|
+
`[${source}]{ ${
|
|
23
|
+
source.includes('/')
|
|
24
|
+
? `/@${source.slice(2).replace('/', '/timeline/')}`
|
|
25
|
+
: `?at=${source.slice(2)}`
|
|
26
|
+
} }`,
|
|
27
|
+
union([unsafelink])))),
|
|
25
28
|
([el]) => [define(el, { class: 'anchor' })])));
|
|
@@ -22,9 +22,9 @@ describe('Unit: parser/inline/autolink/channel', () => {
|
|
|
22
22
|
});
|
|
23
23
|
|
|
24
24
|
it('valid', () => {
|
|
25
|
-
assert.deepStrictEqual(inspect(parser('@a#b')), [['<a href="/@a?ch=b"
|
|
26
|
-
assert.deepStrictEqual(inspect(parser('@a#b#c')), [['<a href="/@a?ch=b+c"
|
|
27
|
-
assert.deepStrictEqual(inspect(parser('@domain/a#b')), [['<a href="https://domain/@a?ch=b" target="_blank"
|
|
25
|
+
assert.deepStrictEqual(inspect(parser('@a#b')), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser('@a#b#c')), [['<a class="channel" href="/@a?ch=b+c">@a#b#c</a>'], '']);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser('@domain/a#b')), [['<a class="channel" href="https://domain/@a?ch=b" target="_blank">@domain/a#b</a>'], '']);
|
|
28
28
|
});
|
|
29
29
|
|
|
30
30
|
});
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { AutolinkParser } from '../../inline';
|
|
2
|
-
import { union, rewrite, open, convert, fmap, lazy } from '../../../combinator';
|
|
2
|
+
import { union, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
|
|
3
3
|
import { unsafelink } from '../link';
|
|
4
4
|
import { emoji } from './hashtag';
|
|
5
5
|
import { str } from '../../source';
|
|
6
|
+
import { State } from '../../context';
|
|
6
7
|
import { define } from 'typed-dom/dom';
|
|
7
8
|
|
|
8
9
|
export const hashnum: AutolinkParser.HashnumParser = lazy(() => fmap(rewrite(
|
|
9
|
-
|
|
10
|
+
constraint(State.shortcut, false,
|
|
11
|
+
open('#', str(new RegExp(/^[0-9]{1,16}(?![^\p{C}\p{S}\p{P}\s]|emoji|['_])/u.source.replace(/emoji/, emoji), 'u')))),
|
|
10
12
|
convert(
|
|
11
13
|
source => `[${source}]{ ${source.slice(1)} }`,
|
|
12
14
|
union([unsafelink]))),
|
|
@@ -42,26 +42,26 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
|
|
|
42
42
|
});
|
|
43
43
|
|
|
44
44
|
it('valid', () => {
|
|
45
|
-
assert.deepStrictEqual(inspect(parser('#a')), [['<a href="/hashtags/a"
|
|
46
|
-
assert.deepStrictEqual(inspect(parser('#a ')), [['<a href="/hashtags/a"
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('#a\n')), [['<a href="/hashtags/a"
|
|
48
|
-
assert.deepStrictEqual(inspect(parser('#a\\')), [['<a href="/hashtags/a"
|
|
49
|
-
assert.deepStrictEqual(inspect(parser('#a\\ ')), [['<a href="/hashtags/a"
|
|
50
|
-
assert.deepStrictEqual(inspect(parser('#a\\\n')), [['<a href="/hashtags/a"
|
|
51
|
-
assert.deepStrictEqual(inspect(parser('#a)')), [['<a href="/hashtags/a"
|
|
52
|
-
assert.deepStrictEqual(inspect(parser('#a(b')), [['<a href="/hashtags/a"
|
|
53
|
-
assert.deepStrictEqual(inspect(parser('#a(b)')), [['<a href="/hashtags/a"
|
|
54
|
-
assert.deepStrictEqual(inspect(parser('#a_')), [['<a href="/hashtags/a"
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('#a_b')), [['<a href="/hashtags/a_b"
|
|
56
|
-
assert.deepStrictEqual(inspect(parser(`#a_'b`)), [['<a href="/hashtags/a"
|
|
57
|
-
assert.deepStrictEqual(inspect(parser('#a__b')), [['<a href="/hashtags/a"
|
|
58
|
-
assert.deepStrictEqual(inspect(parser('#あ')), [['<a href="/hashtags/あ"
|
|
59
|
-
assert.deepStrictEqual(inspect(parser('#👩')), [['<a href="/hashtags/👩"
|
|
60
|
-
assert.deepStrictEqual(inspect(parser('#1a')), [['<a href="/hashtags/1a"
|
|
61
|
-
assert.deepStrictEqual(inspect(parser('#1あ')), [['<a href="/hashtags/1あ"
|
|
62
|
-
assert.deepStrictEqual(inspect(parser('#1👩')), [['<a href="/hashtags/1👩"
|
|
63
|
-
assert.deepStrictEqual(inspect(parser('#domain/a')), [['<a href="https://domain/hashtags/a" target="_blank"
|
|
64
|
-
assert.deepStrictEqual(inspect(parser('#domain.co.jp/a')), [['<a href="https://domain.co.jp/hashtags/a" target="_blank"
|
|
45
|
+
assert.deepStrictEqual(inspect(parser('#a')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser('#a ')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], ' ']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser('#a\n')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '\n']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser('#a\\')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '\\']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser('#a\\ ')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '\\ ']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser('#a\\\n')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '\\\n']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser('#a)')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], ')']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser('#a(b')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '(b']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser('#a(b)')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '(b)']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser('#a_')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '_']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser('#a_b')), [['<a class="hashtag" href="/hashtags/a_b">#a_b</a>'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser(`#a_'b`)), [['<a class="hashtag" href="/hashtags/a">#a</a>'], `_'b`]);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser('#a__b')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '__b']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser('#あ')), [['<a class="hashtag" href="/hashtags/あ">#あ</a>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser('#👩')), [['<a class="hashtag" href="/hashtags/👩">#👩</a>'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser('#1a')), [['<a class="hashtag" href="/hashtags/1a">#1a</a>'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser('#1あ')), [['<a class="hashtag" href="/hashtags/1あ">#1あ</a>'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser('#1👩')), [['<a class="hashtag" href="/hashtags/1👩">#1👩</a>'], '']);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser('#domain/a')), [['<a class="hashtag" href="https://domain/hashtags/a" target="_blank">#domain/a</a>'], '']);
|
|
64
|
+
assert.deepStrictEqual(inspect(parser('#domain.co.jp/a')), [['<a class="hashtag" href="https://domain.co.jp/hashtags/a" target="_blank">#domain.co.jp/a</a>'], '']);
|
|
65
65
|
// Reserved
|
|
66
66
|
assert.deepStrictEqual(inspect(parser(`#a'`)), [[`#a'`], '']);
|
|
67
67
|
assert.deepStrictEqual(inspect(parser(`#a'b`)), [[`#a'b`], '']);
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { AutolinkParser } from '../../inline';
|
|
2
|
-
import { union, tails, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
|
|
2
|
+
import { union, tails, constraint, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
|
|
3
3
|
import { unsafelink } from '../link';
|
|
4
4
|
import { str } from '../../source';
|
|
5
|
+
import { State } from '../../context';
|
|
5
6
|
import { define } from 'typed-dom/dom';
|
|
6
7
|
|
|
7
8
|
// https://example/hashtags/a must be a hashtag page or a redirect page going there.
|
|
@@ -10,6 +11,7 @@ import { define } from 'typed-dom/dom';
|
|
|
10
11
|
export const emoji = String.raw`\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F`;
|
|
11
12
|
|
|
12
13
|
export const hashtag: AutolinkParser.HashtagParser = lazy(() => fmap(rewrite(
|
|
14
|
+
constraint(State.shortcut, false,
|
|
13
15
|
open(
|
|
14
16
|
'#',
|
|
15
17
|
tails([
|
|
@@ -23,7 +25,7 @@ export const hashtag: AutolinkParser.HashtagParser = lazy(() => fmap(rewrite(
|
|
|
23
25
|
/(?!_?(?:[^\p{C}\p{S}\p{P}\s]|emoji)|')/u.source,
|
|
24
26
|
].join('').replace(/emoji/g, emoji), 'u')),
|
|
25
27
|
([source]) => source.length <= 128),
|
|
26
|
-
])),
|
|
28
|
+
]))),
|
|
27
29
|
convert(
|
|
28
30
|
source =>
|
|
29
31
|
`[${source}]{ ${
|