securemark 0.259.1 → 0.260.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +13 -0
- package/design.md +16 -5
- package/dist/index.js +548 -226
- package/package.json +1 -1
- package/src/combinator/control/constraint/block.test.ts +5 -5
- package/src/combinator/control/constraint/block.ts +2 -2
- package/src/combinator/control/constraint/contract.ts +4 -4
- package/src/combinator/control/constraint/line.test.ts +6 -6
- package/src/combinator/control/constraint/line.ts +5 -5
- package/src/combinator/control/manipulation/convert.ts +5 -5
- package/src/combinator/control/manipulation/fence.ts +1 -1
- package/src/combinator/control/manipulation/indent.test.ts +14 -14
- package/src/combinator/control/manipulation/indent.ts +5 -5
- package/src/combinator/control/manipulation/lazy.ts +2 -2
- package/src/combinator/control/manipulation/match.ts +2 -2
- package/src/combinator/control/manipulation/recovery.ts +6 -6
- package/src/combinator/control/manipulation/scope.ts +11 -10
- package/src/combinator/control/manipulation/surround.ts +9 -8
- package/src/combinator/control/manipulation/trim.test.ts +9 -9
- package/src/combinator/control/monad/bind.ts +2 -2
- package/src/combinator/data/parser/context/memo.ts +3 -4
- package/src/combinator/data/parser/context.test.ts +9 -9
- package/src/combinator/data/parser/context.ts +18 -17
- package/src/combinator/data/parser/inits.ts +2 -2
- package/src/combinator/data/parser/sequence.test.ts +10 -10
- package/src/combinator/data/parser/sequence.ts +2 -2
- package/src/combinator/data/parser/some.test.ts +13 -13
- package/src/combinator/data/parser/some.ts +2 -2
- package/src/combinator/data/parser/subsequence.test.ts +14 -14
- package/src/combinator/data/parser/union.test.ts +10 -10
- package/src/combinator/data/parser/union.ts +2 -2
- package/src/combinator/data/parser.ts +6 -1
- package/src/parser/api/bind.ts +1 -1
- package/src/parser/api/header.ts +1 -1
- package/src/parser/api/normalize.ts +1 -1
- package/src/parser/api/parse.test.ts +19 -19
- package/src/parser/api/parse.ts +1 -1
- package/src/parser/autolink.test.ts +7 -7
- package/src/parser/autolink.ts +2 -2
- package/src/parser/block/blockquote.test.ts +9 -9
- package/src/parser/block/blockquote.ts +1 -1
- package/src/parser/block/codeblock.test.ts +5 -5
- package/src/parser/block/codeblock.ts +1 -1
- package/src/parser/block/dlist.test.ts +2 -2
- package/src/parser/block/extension/aside.test.ts +1 -1
- package/src/parser/block/extension/example.test.ts +1 -1
- package/src/parser/block/extension/example.ts +1 -1
- package/src/parser/block/extension/fig.test.ts +1 -1
- package/src/parser/block/extension/figbase.test.ts +1 -1
- package/src/parser/block/extension/figure.test.ts +2 -2
- package/src/parser/block/extension/figure.ts +1 -1
- package/src/parser/block/extension/message.test.ts +1 -1
- package/src/parser/block/extension/message.ts +1 -1
- package/src/parser/block/extension/placeholder.test.ts +1 -1
- package/src/parser/block/extension/table.test.ts +1 -1
- package/src/parser/block/extension/table.ts +1 -1
- package/src/parser/block/extension.test.ts +1 -1
- package/src/parser/block/heading.test.ts +8 -8
- package/src/parser/block/heading.ts +1 -1
- package/src/parser/block/horizontalrule.test.ts +1 -1
- package/src/parser/block/ilist.test.ts +1 -1
- package/src/parser/block/mathblock.test.ts +1 -1
- package/src/parser/block/olist.test.ts +2 -2
- package/src/parser/block/olist.ts +5 -5
- package/src/parser/block/paragraph.test.ts +15 -15
- package/src/parser/block/reply/cite.test.ts +12 -12
- package/src/parser/block/reply/cite.ts +2 -2
- package/src/parser/block/reply/quote.test.ts +4 -4
- package/src/parser/block/reply/quote.ts +2 -2
- package/src/parser/block/reply.test.ts +9 -9
- package/src/parser/block/sidefence.test.ts +7 -7
- package/src/parser/block/table.test.ts +1 -1
- package/src/parser/block/table.ts +1 -1
- package/src/parser/block/ulist.test.ts +2 -2
- package/src/parser/block/ulist.ts +1 -1
- package/src/parser/block.ts +2 -2
- package/src/parser/context.ts +8 -7
- package/src/parser/header.test.ts +1 -1
- package/src/parser/header.ts +3 -3
- package/src/parser/inline/annotation.test.ts +4 -4
- package/src/parser/inline/autolink/account.test.ts +12 -12
- package/src/parser/inline/autolink/account.ts +4 -2
- package/src/parser/inline/autolink/anchor.test.ts +10 -10
- package/src/parser/inline/autolink/anchor.ts +14 -11
- package/src/parser/inline/autolink/channel.test.ts +4 -4
- package/src/parser/inline/autolink/email.test.ts +1 -1
- package/src/parser/inline/autolink/email.ts +1 -1
- package/src/parser/inline/autolink/hashnum.test.ts +1 -1
- package/src/parser/inline/autolink/hashnum.ts +4 -2
- package/src/parser/inline/autolink/hashtag.test.ts +21 -21
- package/src/parser/inline/autolink/hashtag.ts +4 -2
- package/src/parser/inline/autolink/url.test.ts +56 -56
- package/src/parser/inline/bracket.test.ts +1 -1
- package/src/parser/inline/code.test.ts +1 -1
- package/src/parser/inline/code.ts +2 -2
- package/src/parser/inline/comment.test.ts +1 -1
- package/src/parser/inline/deletion.test.ts +1 -1
- package/src/parser/inline/emphasis.test.ts +1 -1
- package/src/parser/inline/emstrong.ts +2 -2
- package/src/parser/inline/escape.ts +3 -3
- package/src/parser/inline/extension/index.test.ts +1 -1
- package/src/parser/inline/extension/indexer.test.ts +1 -1
- package/src/parser/inline/extension/label.test.ts +1 -1
- package/src/parser/inline/extension/placeholder.test.ts +1 -1
- package/src/parser/inline/html.test.ts +1 -3
- package/src/parser/inline/html.ts +1 -1
- package/src/parser/inline/htmlentity.test.ts +1 -1
- package/src/parser/inline/htmlentity.ts +1 -1
- package/src/parser/inline/insertion.test.ts +1 -1
- package/src/parser/inline/link.test.ts +111 -111
- package/src/parser/inline/link.ts +30 -28
- package/src/parser/inline/mark.test.ts +1 -1
- package/src/parser/inline/math.test.ts +1 -1
- package/src/parser/inline/math.ts +1 -1
- package/src/parser/inline/media.test.ts +2 -1
- package/src/parser/inline/media.ts +3 -3
- package/src/parser/inline/reference.test.ts +4 -4
- package/src/parser/inline/ruby.test.ts +1 -1
- package/src/parser/inline/ruby.ts +3 -3
- package/src/parser/inline/shortmedia.test.ts +1 -1
- package/src/parser/inline/strong.test.ts +1 -1
- package/src/parser/inline/template.test.ts +1 -1
- package/src/parser/inline.test.ts +52 -52
- package/src/parser/locale.test.ts +1 -1
- package/src/parser/segment.ts +1 -1
- package/src/parser/source/escapable.test.ts +1 -1
- package/src/parser/source/escapable.ts +1 -1
- package/src/parser/source/line.test.ts +1 -1
- package/src/parser/source/line.ts +2 -2
- package/src/parser/source/str.ts +4 -4
- package/src/parser/source/text.test.ts +1 -1
- package/src/parser/source/text.ts +3 -3
- package/src/parser/source/unescapable.test.ts +1 -1
- package/src/parser/source/unescapable.ts +1 -1
- package/src/parser/visibility.ts +13 -13
- 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
- package/src/util/quote.ts +1 -1
|
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
|
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/inline/media', () => {
|
|
6
6
|
describe('media', () => {
|
|
7
|
-
const parser = (source: string) => some(media)(source, {});
|
|
7
|
+
const parser = (source: string) => some(media)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('xss', () => {
|
|
10
10
|
assert.deepStrictEqual(inspect(parser('![]{javascript:alert}')), [['<img class="media invalid" data-src="javascript:alert" alt="">'], '']);
|
|
@@ -90,6 +90,7 @@ describe('Unit: parser/inline/media', () => {
|
|
|
90
90
|
it('nest', () => {
|
|
91
91
|
assert.deepStrictEqual(inspect(parser('![\\[]{/}')), [['<a href="/" target="_blank"><img class="media" data-src="/" alt="["></a>'], '']);
|
|
92
92
|
assert.deepStrictEqual(inspect(parser('![\\"]{"?"#"}')), [['<a href=""?"#"" target="_blank"><img class="media" data-src=""?"#"" alt="""></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
|
|
|
@@ -55,11 +55,11 @@ export const media: MediaParser = lazy(() => validate(['![', '!{'], open(
|
|
|
55
55
|
el.style.aspectRatio = el.getAttribute('aspect-ratio')!;
|
|
56
56
|
}
|
|
57
57
|
if (context.state! & State.link) return [[el], rest];
|
|
58
|
-
if (cache && cache.tagName !== 'IMG') return creation(10, (..._) => [[el!], rest])('!', context);
|
|
58
|
+
if (cache && cache.tagName !== 'IMG') return creation(10, (..._) => [[el!], rest])({ source: '!', context });
|
|
59
59
|
return fmap(
|
|
60
60
|
unsafelink as MediaParser,
|
|
61
|
-
([link]) => [define(link, { target: '_blank' }, [el])])
|
|
62
|
-
(`{ ${INSECURE_URI}${params.join('')} }${rest}`, context);
|
|
61
|
+
([link]) => [define(link, { class: null, target: '_blank' }, [el])])
|
|
62
|
+
({ source: `{ ${INSECURE_URI}${params.join('')} }${rest}`, context });
|
|
63
63
|
}))))));
|
|
64
64
|
|
|
65
65
|
const bracket: MediaParser.TextParser.BracketParser = lazy(() => creation(union([
|
|
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
|
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/inline/reference', () => {
|
|
6
6
|
describe('reference', () => {
|
|
7
|
-
const parser = (source: string) => some(reference)(source, {});
|
|
7
|
+
const parser = (source: string) => some(reference)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('invalid', () => {
|
|
10
10
|
assert.deepStrictEqual(inspect(parser('')), undefined);
|
|
@@ -44,9 +44,9 @@ describe('Unit: parser/inline/reference', () => {
|
|
|
44
44
|
|
|
45
45
|
it('nest', () => {
|
|
46
46
|
assert.deepStrictEqual(inspect(parser('[[`a`]]')), [['<sup class="reference"><span><code data-src="`a`">a</code></span></sup>'], '']);
|
|
47
|
-
assert.deepStrictEqual(inspect(parser('[[@a]]')), [['<sup class="reference"><span><a
|
|
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="url" 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>'], '']);
|
|
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
|
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/inline/ruby', () => {
|
|
6
6
|
describe('ruby', () => {
|
|
7
|
-
const parser = (source: string) => some(ruby)(source, {});
|
|
7
|
+
const parser = (source: string) => some(ruby)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('invalid', () => {
|
|
10
10
|
assert.deepStrictEqual(inspect(parser('')), undefined);
|
|
@@ -48,14 +48,14 @@ export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.none, 2,
|
|
|
48
48
|
}
|
|
49
49
|
}))));
|
|
50
50
|
|
|
51
|
-
const text: RubyParser.TextParser = creation((source, context) => {
|
|
51
|
+
const text: RubyParser.TextParser = creation(({ source, context }) => {
|
|
52
52
|
const acc = [''];
|
|
53
53
|
while (source !== '') {
|
|
54
54
|
assert(source[0] !== '\n');
|
|
55
55
|
switch (source[0]) {
|
|
56
56
|
// @ts-expect-error
|
|
57
57
|
case '&': {
|
|
58
|
-
const result = unsafehtmlentity(source, context);
|
|
58
|
+
const result = unsafehtmlentity({ source, context });
|
|
59
59
|
if (result) {
|
|
60
60
|
acc[acc.length - 1] += eval(result)[0];
|
|
61
61
|
source = exec(result, source.slice(1));
|
|
@@ -69,7 +69,7 @@ const text: RubyParser.TextParser = creation((source, context) => {
|
|
|
69
69
|
source = source.slice(1);
|
|
70
70
|
continue;
|
|
71
71
|
}
|
|
72
|
-
const result = txt(source, context)!;
|
|
72
|
+
const result = txt({ source, context })!;
|
|
73
73
|
assert(result);
|
|
74
74
|
acc[acc.length - 1] += eval(result)[0] ?? source.slice(0, source.length - exec(result).length);
|
|
75
75
|
source = exec(result);
|
|
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
|
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/inline/shortmedia', () => {
|
|
6
6
|
describe('shortmedia', () => {
|
|
7
|
-
const parser = (source: string) => some(shortmedia)(source, {});
|
|
7
|
+
const parser = (source: string) => some(shortmedia)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('invalid', () => {
|
|
10
10
|
assert.deepStrictEqual(inspect(parser('')), undefined);
|
|
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
|
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/inline/strong', () => {
|
|
6
6
|
describe('strong', () => {
|
|
7
|
-
const parser = (source: string) => some(strong)(source, {});
|
|
7
|
+
const parser = (source: string) => some(strong)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('invalid', () => {
|
|
10
10
|
assert.deepStrictEqual(inspect(parser('**')), undefined);
|
|
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
|
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/inline/template', () => {
|
|
6
6
|
describe('template', () => {
|
|
7
|
-
const parser = (source: string) => some(template)(source, {});
|
|
7
|
+
const parser = (source: string) => some(template)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('invalid', () => {
|
|
10
10
|
assert.deepStrictEqual(inspect(parser('')), undefined);
|
|
@@ -4,7 +4,7 @@ import { inspect } from '../debug.test';
|
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/inline', () => {
|
|
6
6
|
describe('inline', () => {
|
|
7
|
-
const parser = (source: string) => some(inline)(source, {});
|
|
7
|
+
const parser = (source: string) => some(inline)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('empty', () => {
|
|
10
10
|
assert.deepStrictEqual(inspect(parser('')), undefined);
|
|
@@ -107,7 +107,7 @@ describe('Unit: parser/inline', () => {
|
|
|
107
107
|
assert.deepStrictEqual(inspect(parser('*<*>')), [['<em><</em>', '>'], '']);
|
|
108
108
|
assert.deepStrictEqual(inspect(parser('*a((b))*')), [['<em>a<sup class="annotation"><span>b</span></sup></em>'], '']);
|
|
109
109
|
assert.deepStrictEqual(inspect(parser('``a`')), [['``', 'a', '`'], '']);
|
|
110
|
-
assert.deepStrictEqual(inspect(parser('[@a]')), [['[', '<a
|
|
110
|
+
assert.deepStrictEqual(inspect(parser('[@a]')), [['[', '<a class="account" href="/@a">@a</a>', ']'], '']);
|
|
111
111
|
assert.deepStrictEqual(inspect(parser('[#1][#2]')), [['<a class="index" href="#index:1">1</a>', '<a class="index" href="#index:2">2</a>'], '']);
|
|
112
112
|
assert.deepStrictEqual(inspect(parser('[$1]')), [['[', '$', '1', ']'], '']);
|
|
113
113
|
assert.deepStrictEqual(inspect(parser('[$1-2]')), [['[', '$', '1-2', ']'], '']);
|
|
@@ -115,29 +115,29 @@ describe('Unit: parser/inline', () => {
|
|
|
115
115
|
assert.deepStrictEqual(inspect(parser('$-1, $-2')), [['<a class="label" data-label="$-1">$-1</a>', ',', ' ', '<a class="label" data-label="$-2">$-2</a>'], '']);
|
|
116
116
|
assert.deepStrictEqual(inspect(parser('$-1 and $-2')), [['<a class="label" data-label="$-1">$-1</a>', ' ', 'and', ' ', '<a class="label" data-label="$-2">$-2</a>'], '']);
|
|
117
117
|
assert.deepStrictEqual(inspect(parser('$$-1')), [['$', '<a class="label" data-label="$-1">$-1</a>'], '']);
|
|
118
|
-
assert.deepStrictEqual(inspect(parser('[[#a]]')), [['<sup class="reference"><span><a href="/hashtags/a"
|
|
118
|
+
assert.deepStrictEqual(inspect(parser('[[#a]]')), [['<sup class="reference"><span><a class="hashtag" href="/hashtags/a">#a</a></span></sup>'], '']);
|
|
119
119
|
assert.deepStrictEqual(inspect(parser('[[$-1]]')), [['<sup class="reference"><span><a class="label" data-label="$-1">$-1</a></span></sup>'], '']);
|
|
120
|
-
assert.deepStrictEqual(inspect(parser('[[#-1]]{b}')), [['<sup class="reference"><span>#-1</span></sup>', '<a href="b">b</a>'], '']);
|
|
120
|
+
assert.deepStrictEqual(inspect(parser('[[#-1]]{b}')), [['<sup class="reference"><span>#-1</span></sup>', '<a class="url" href="b">b</a>'], '']);
|
|
121
121
|
assert.deepStrictEqual(inspect(parser('[[#-1]](b)')), [['<sup class="reference"><span>#-1</span></sup>', '(', 'b', ')'], '']);
|
|
122
|
-
assert.deepStrictEqual(inspect(parser('[[#-1]a]{b}')), [['<a href="b">[#-1]a</a>'], '']);
|
|
122
|
+
assert.deepStrictEqual(inspect(parser('[[#-1]a]{b}')), [['<a class="link" href="b">[#-1]a</a>'], '']);
|
|
123
123
|
assert.deepStrictEqual(inspect(parser('[[#-1]a](b)')), [['[', '<a class="index" href="#index:-1">-1</a>', 'a', ']', '(', 'b', ')'], '']);
|
|
124
|
-
assert.deepStrictEqual(inspect(parser('[#a]{b}')), [['<a class="index" href="#index:a">a</a>', '<a href="b">b</a>'], '']);
|
|
125
|
-
assert.deepStrictEqual(inspect(parser('[@a]{b}')), [['
|
|
126
|
-
assert.deepStrictEqual(inspect(parser('[http://host]{http://evil}')), [['[', '<a href="http://host" target="_blank">http://host</a>', ']', '<a href="http://evil" target="_blank">http://evil</a>'], '']);
|
|
127
|
-
assert.deepStrictEqual(inspect(parser('[http://host]{http://host}')), [['[', '<a href="http://host" target="_blank">http://host</a>', ']', '<a href="http://host" target="_blank">http://host</a>'], '']);
|
|
124
|
+
assert.deepStrictEqual(inspect(parser('[#a]{b}')), [['<a class="index" href="#index:a">a</a>', '<a class="url" href="b">b</a>'], '']);
|
|
125
|
+
assert.deepStrictEqual(inspect(parser('[@a]{b}')), [['<a class="link" href="b">@a</a>'], '']);
|
|
126
|
+
assert.deepStrictEqual(inspect(parser('[http://host]{http://evil}')), [['[', '<a class="url" href="http://host" target="_blank">http://host</a>', ']', '<a class="url" href="http://evil" target="_blank">http://evil</a>'], '']);
|
|
127
|
+
assert.deepStrictEqual(inspect(parser('[http://host]{http://host}')), [['[', '<a class="url" href="http://host" target="_blank">http://host</a>', ']', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
|
|
128
128
|
assert.deepStrictEqual(inspect(parser('[]{{a}}')), [['[', ']', '<span class="template">{{a}}</span>'], '']);
|
|
129
129
|
assert.deepStrictEqual(inspect(parser('![]{{a}}')), [['!', '[', ']', '<span class="template">{{a}}</span>'], '']);
|
|
130
|
-
assert.deepStrictEqual(inspect(parser('[\n]{a}')), [['[', '<br>', ']', '<a href="a">a</a>'], '']);
|
|
131
|
-
assert.deepStrictEqual(inspect(parser('[\\\n]{a}')), [['[', '<span class="linebreak"> </span>', ']', '<a href="a">a</a>'], '']);
|
|
130
|
+
assert.deepStrictEqual(inspect(parser('[\n]{a}')), [['[', '<br>', ']', '<a class="url" href="a">a</a>'], '']);
|
|
131
|
+
assert.deepStrictEqual(inspect(parser('[\\\n]{a}')), [['[', '<span class="linebreak"> </span>', ']', '<a class="url" href="a">a</a>'], '']);
|
|
132
132
|
assert.deepStrictEqual(inspect(parser('{}')), [['{', '}'], '']);
|
|
133
|
-
assert.deepStrictEqual(inspect(parser('{a}')), [['<a href="a">a</a>'], '']);
|
|
133
|
+
assert.deepStrictEqual(inspect(parser('{a}')), [['<a class="url" href="a">a</a>'], '']);
|
|
134
134
|
assert.deepStrictEqual(inspect(parser('{{a}}')), [['<span class="template">{{a}}</span>'], '']);
|
|
135
135
|
assert.deepStrictEqual(inspect(parser('!{}')), [['!', '{', '}'], '']);
|
|
136
136
|
assert.deepStrictEqual(inspect(parser('!{a}')), [['<a href="a" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
|
|
137
137
|
assert.deepStrictEqual(inspect(parser('!{{a}}')), [['!', '<span class="template">{{a}}</span>'], '']);
|
|
138
138
|
assert.deepStrictEqual(inspect(parser('!{{{a}}}')), [['!', '<span class="template">{{{a}}}</span>'], '']);
|
|
139
139
|
assert.deepStrictEqual(inspect(parser('!!{a}')), [['!', '<a href="a" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
|
|
140
|
-
assert.deepStrictEqual(inspect(parser('${a}')), [['$', '<a href="a">a</a>'], '']);
|
|
140
|
+
assert.deepStrictEqual(inspect(parser('${a}')), [['$', '<a class="url" href="a">a</a>'], '']);
|
|
141
141
|
assert.deepStrictEqual(inspect(parser('${{a}}')), [['$', '<span class="template">{{a}}</span>'], '']);
|
|
142
142
|
assert.deepStrictEqual(inspect(parser('${{{a}}}')), [['$', '<span class="template">{{{a}}}</span>'], '']);
|
|
143
143
|
assert.deepStrictEqual(inspect(parser('Di$ney Micro$oft')), [['Di', '$', 'ney', ' ', 'Micro', '$', 'oft'], '']);
|
|
@@ -152,22 +152,22 @@ describe('Unit: parser/inline', () => {
|
|
|
152
152
|
assert.deepStrictEqual(inspect(parser('[[[[a]]')), [['', '[', '', '[', '<sup class="reference"><span>a</span></sup>'], '']);
|
|
153
153
|
assert.deepStrictEqual(inspect(parser('[[[[a]]]]')), [['<sup class="reference"><span>[[a]]</span></sup>'], '']);
|
|
154
154
|
assert.deepStrictEqual(inspect(parser('[[[$-1]]]')), [['<sup class="reference"><span><a class="label" data-label="$-1">$-1</a></span></sup>'], '']);
|
|
155
|
-
assert.deepStrictEqual(inspect(parser('[[[]{a}]]')), [['<sup class="reference"><span><a href="a">a</a></span></sup>'], '']);
|
|
156
|
-
assert.deepStrictEqual(inspect(parser('[[[a]{b}]]')), [['<sup class="reference"><span><a href="b">a</a></span></sup>'], '']);
|
|
157
|
-
assert.deepStrictEqual(inspect(parser('[(([a]{#}))]{#}')), [['<a href="#"><span class="paren">(<span class="paren">([a]{#})</span>)</span></a>'], '']);
|
|
155
|
+
assert.deepStrictEqual(inspect(parser('[[[]{a}]]')), [['<sup class="reference"><span><a class="url" href="a">a</a></span></sup>'], '']);
|
|
156
|
+
assert.deepStrictEqual(inspect(parser('[[[a]{b}]]')), [['<sup class="reference"><span><a class="link" href="b">a</a></span></sup>'], '']);
|
|
157
|
+
assert.deepStrictEqual(inspect(parser('[(([a]{#}))]{#}')), [['<a class="link" href="#"><span class="paren">(<span class="paren">([a]{#})</span>)</span></a>'], '']);
|
|
158
158
|
assert.deepStrictEqual(inspect(parser('[[<bdi>]]')), [['<sup class="reference"><span><span class="invalid"><bdi></span></span></sup>'], '']);
|
|
159
159
|
assert.deepStrictEqual(inspect(parser('[[${]]}$')), [['', '[', '', '[', '<span class="math" translate="no" data-src="${]]}$">${]]}$</span>'], '']);
|
|
160
160
|
assert.deepStrictEqual(inspect(parser('"[[""]]')), [['"', '<sup class="reference"><span>""</span></sup>'], '']);
|
|
161
|
-
assert.deepStrictEqual(inspect(parser('[[a](b)]{c}')), [['<a href="c"><ruby>a<rp>(</rp><rt>b</rt><rp>)</rp></ruby></a>'], '']);
|
|
162
|
-
assert.deepStrictEqual(inspect(parser('[[[[[[[{a}')), [['', '[', '', '[', '', '[', '', '[', '', '[', '', '[', '', '[', '<a href="a">a</a>'], '']);
|
|
163
|
-
assert.deepStrictEqual(inspect(parser('<http://host>')), [['<', '<a href="http://host" target="_blank">http://host</a>', '>'], '']);
|
|
164
|
-
assert.deepStrictEqual(inspect(parser('[~http://host')), [['', '[', '~', '<a href="http://host" target="_blank">http://host</a>'], '']);
|
|
161
|
+
assert.deepStrictEqual(inspect(parser('[[a](b)]{c}')), [['<a class="link" href="c"><ruby>a<rp>(</rp><rt>b</rt><rp>)</rp></ruby></a>'], '']);
|
|
162
|
+
assert.deepStrictEqual(inspect(parser('[[[[[[[{a}')), [['', '[', '', '[', '', '[', '', '[', '', '[', '', '[', '', '[', '<a class="url" href="a">a</a>'], '']);
|
|
163
|
+
assert.deepStrictEqual(inspect(parser('<http://host>')), [['<', '<a class="url" href="http://host" target="_blank">http://host</a>', '>'], '']);
|
|
164
|
+
assert.deepStrictEqual(inspect(parser('[~http://host')), [['', '[', '~', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
|
|
165
165
|
assert.deepStrictEqual(inspect(parser('[~a@b')), [['', '[', '~', '<a class="email" href="mailto:a@b">a@b</a>'], '']);
|
|
166
166
|
assert.deepStrictEqual(inspect(parser('[~~a~~]')), [['[', '<del>a</del>', ']'], '']);
|
|
167
|
-
assert.deepStrictEqual(inspect(parser('[^http://host')), [['[^', '<a href="http://host" target="_blank">http://host</a>'], '']);
|
|
167
|
+
assert.deepStrictEqual(inspect(parser('[^http://host')), [['[^', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
|
|
168
168
|
assert.deepStrictEqual(inspect(parser('[^a@b')), [['[^', '<a class="email" href="mailto:a@b">a@b</a>'], '']);
|
|
169
|
-
assert.deepStrictEqual(inspect(parser('[#a*b\nc*]')), [['[', '<a href="/hashtags/a"
|
|
170
|
-
assert.deepStrictEqual(inspect(parser('[*a\nb*]{/}')), [['[', '<em>a<br>b</em>', ']', '<a href="/">/</a>'], '']);
|
|
169
|
+
assert.deepStrictEqual(inspect(parser('[#a*b\nc*]')), [['[', '<a class="hashtag" href="/hashtags/a">#a</a>', '<em>b<br>c</em>', ']'], '']);
|
|
170
|
+
assert.deepStrictEqual(inspect(parser('[*a\nb*]{/}')), [['[', '<em>a<br>b</em>', ']', '<a class="url" href="/">/</a>'], '']);
|
|
171
171
|
assert.deepStrictEqual(inspect(parser('[*a\nb]*')), [['[', '*', 'a', '<br>', 'b', ']', '*'], '']);
|
|
172
172
|
assert.deepStrictEqual(inspect(parser('[*[a\nb*]')), [['', '[', '*', '[', 'a', '<br>', 'b', '*', ']'], '']);
|
|
173
173
|
assert.deepStrictEqual(inspect(parser('[[*a\nb*]]')), [['[', '[', '<em>a<br>b</em>', ']', ']'], '']);
|
|
@@ -176,20 +176,20 @@ describe('Unit: parser/inline', () => {
|
|
|
176
176
|
});
|
|
177
177
|
|
|
178
178
|
it('uri', () => {
|
|
179
|
-
assert.deepStrictEqual(inspect(parser('\nhttp://host')), [['<br>', '<a href="http://host" target="_blank">http://host</a>'], '']);
|
|
179
|
+
assert.deepStrictEqual(inspect(parser('\nhttp://host')), [['<br>', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
|
|
180
180
|
assert.deepStrictEqual(inspect(parser('0http://host')), [['0http', ':', '/', '/', 'host'], '']);
|
|
181
181
|
assert.deepStrictEqual(inspect(parser('0aAhttp://host')), [['0aAhttp', ':', '/', '/', 'host'], '']);
|
|
182
|
-
assert.deepStrictEqual(inspect(parser('?http://host')), [['?', '<a href="http://host" target="_blank">http://host</a>'], '']);
|
|
182
|
+
assert.deepStrictEqual(inspect(parser('?http://host')), [['?', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
|
|
183
183
|
assert.deepStrictEqual(inspect(parser('0!http://host')), [['0', '<a href="http://host" target="_blank"><img class="media" data-src="http://host" alt=""></a>'], '']);
|
|
184
|
-
assert.deepStrictEqual(inspect(parser('0?http://host')), [['0', '?', '<a href="http://host" target="_blank">http://host</a>'], '']);
|
|
184
|
+
assert.deepStrictEqual(inspect(parser('0?http://host')), [['0', '?', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
|
|
185
185
|
assert.deepStrictEqual(inspect(parser('0!!http://host')), [['0', '!', '<a href="http://host" target="_blank"><img class="media" data-src="http://host" alt=""></a>'], '']);
|
|
186
186
|
assert.deepStrictEqual(inspect(parser('0?!http://host')), [['0', '?', '<a href="http://host" target="_blank"><img class="media" data-src="http://host" alt=""></a>'], '']);
|
|
187
|
-
assert.deepStrictEqual(inspect(parser('0!?http://host')), [['0', '!', '?', '<a href="http://host" target="_blank">http://host</a>'], '']);
|
|
188
|
-
assert.deepStrictEqual(inspect(parser('_http://host')), [['_', '<a href="http://host" target="_blank">http://host</a>'], '']);
|
|
189
|
-
assert.deepStrictEqual(inspect(parser('*http://host*')), [['<em><a href="http://host" target="_blank">http://host</a></em>'], '']);
|
|
190
|
-
assert.deepStrictEqual(inspect(parser('(http://host)')), [['<span class="paren">(<a href="http://host" target="_blank">http://host</a>)</span>'], '']);
|
|
191
|
-
assert.deepStrictEqual(inspect(parser(' http://host')), [[' ', '<a href="http://host" target="_blank">http://host</a>'], '']);
|
|
192
|
-
assert.deepStrictEqual(inspect(parser('あhttp://hostい')), [['あ', '<a href="http://host" target="_blank">http://host</a>', 'い'], '']);
|
|
187
|
+
assert.deepStrictEqual(inspect(parser('0!?http://host')), [['0', '!', '?', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
|
|
188
|
+
assert.deepStrictEqual(inspect(parser('_http://host')), [['_', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
|
|
189
|
+
assert.deepStrictEqual(inspect(parser('*http://host*')), [['<em><a class="url" href="http://host" target="_blank">http://host</a></em>'], '']);
|
|
190
|
+
assert.deepStrictEqual(inspect(parser('(http://host)')), [['<span class="paren">(<a class="url" href="http://host" target="_blank">http://host</a>)</span>'], '']);
|
|
191
|
+
assert.deepStrictEqual(inspect(parser(' http://host')), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
|
|
192
|
+
assert.deepStrictEqual(inspect(parser('あhttp://hostい')), [['あ', '<a class="url" href="http://host" target="_blank">http://host</a>', 'い'], '']);
|
|
193
193
|
});
|
|
194
194
|
|
|
195
195
|
it('email', () => {
|
|
@@ -202,27 +202,27 @@ describe('Unit: parser/inline', () => {
|
|
|
202
202
|
});
|
|
203
203
|
|
|
204
204
|
it('channel', () => {
|
|
205
|
-
assert.deepStrictEqual(inspect(parser('@a#b')), [['<a href="/@a?ch=b"
|
|
205
|
+
assert.deepStrictEqual(inspect(parser('@a#b')), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
|
|
206
206
|
assert.deepStrictEqual(inspect(parser('@a#domain/b')), [['@a#domain/b'], '']);
|
|
207
|
-
assert.deepStrictEqual(inspect(parser('@domain/a#b')), [['<a href="https://domain/@a?ch=b" target="_blank"
|
|
207
|
+
assert.deepStrictEqual(inspect(parser('@domain/a#b')), [['<a class="channel" href="https://domain/@a?ch=b" target="_blank">@domain/a#b</a>'], '']);
|
|
208
208
|
assert.deepStrictEqual(inspect(parser('@domain/a#domain/b')), [['@domain/a#domain/b'], '']);
|
|
209
|
-
assert.deepStrictEqual(inspect(parser('_@a#b')), [['_', '<a href="/@a?ch=b"
|
|
210
|
-
assert.deepStrictEqual(inspect(parser(' @a#b')), [[' ', '<a href="/@a?ch=b"
|
|
209
|
+
assert.deepStrictEqual(inspect(parser('_@a#b')), [['_', '<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
|
|
210
|
+
assert.deepStrictEqual(inspect(parser(' @a#b')), [[' ', '<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
|
|
211
211
|
});
|
|
212
212
|
|
|
213
213
|
it('account', () => {
|
|
214
|
-
assert.deepStrictEqual(inspect(parser('@a')), [['<a
|
|
215
|
-
assert.deepStrictEqual(inspect(parser('_@a')), [['_', '<a
|
|
216
|
-
assert.deepStrictEqual(inspect(parser('*@a*')), [['<em><a
|
|
217
|
-
assert.deepStrictEqual(inspect(parser('(@a)')), [['<span class="paren">(<a
|
|
218
|
-
assert.deepStrictEqual(inspect(parser(' @a')), [[' ', '<a
|
|
214
|
+
assert.deepStrictEqual(inspect(parser('@a')), [['<a class="account" href="/@a">@a</a>'], '']);
|
|
215
|
+
assert.deepStrictEqual(inspect(parser('_@a')), [['_', '<a class="account" href="/@a">@a</a>'], '']);
|
|
216
|
+
assert.deepStrictEqual(inspect(parser('*@a*')), [['<em><a class="account" href="/@a">@a</a></em>'], '']);
|
|
217
|
+
assert.deepStrictEqual(inspect(parser('(@a)')), [['<span class="paren">(<a class="account" href="/@a">@a</a>)</span>'], '']);
|
|
218
|
+
assert.deepStrictEqual(inspect(parser(' @a')), [[' ', '<a class="account" href="/@a">@a</a>'], '']);
|
|
219
219
|
});
|
|
220
220
|
|
|
221
221
|
it('hashtag', () => {
|
|
222
222
|
assert.deepStrictEqual(inspect(parser('#a#')), [['#a#'], '']);
|
|
223
223
|
assert.deepStrictEqual(inspect(parser('#a#b')), [['#a#b'], '']);
|
|
224
|
-
assert.deepStrictEqual(inspect(parser('#a')), [['<a href="/hashtags/a"
|
|
225
|
-
assert.deepStrictEqual(inspect(parser('#a\nb\n#c\n[#d]')), [['<a href="/hashtags/a"
|
|
224
|
+
assert.deepStrictEqual(inspect(parser('#a')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
|
|
225
|
+
assert.deepStrictEqual(inspect(parser('#a\nb\n#c\n[#d]')), [['<a class="hashtag" href="/hashtags/a">#a</a>', '<br>', 'b', '<br>', '<a class="hashtag" href="/hashtags/c">#c</a>', '<br>', '<a class="index" href="#index:d">d</a>'], '']);
|
|
226
226
|
assert.deepStrictEqual(inspect(parser('##a')), [['##a'], '']);
|
|
227
227
|
assert.deepStrictEqual(inspect(parser('a#b')), [['a#b'], '']);
|
|
228
228
|
assert.deepStrictEqual(inspect(parser('0a#b')), [['0a#b'], '']);
|
|
@@ -230,15 +230,15 @@ describe('Unit: parser/inline', () => {
|
|
|
230
230
|
assert.deepStrictEqual(inspect(parser('あい#b')), [['あ', 'い#b'], '']);
|
|
231
231
|
assert.deepStrictEqual(inspect(parser('0aあ#b')), [['0aあ#b'], '']);
|
|
232
232
|
assert.deepStrictEqual(inspect(parser('0aあい#b')), [['0a', 'あ', 'い#b'], '']);
|
|
233
|
-
assert.deepStrictEqual(inspect(parser('「#あ」')), [['「', '<a href="/hashtags/あ"
|
|
234
|
-
assert.deepStrictEqual(inspect(parser('a\n#b')), [['a', '<br>', '<a href="/hashtags/b"
|
|
235
|
-
assert.deepStrictEqual(inspect(parser('a\\\n#b')), [['a', '<span class="linebreak"> </span>', '<a href="/hashtags/b"
|
|
236
|
-
assert.deepStrictEqual(inspect(parser('*a*#b')), [['<em>a</em>', '<a href="/hashtags/b"
|
|
237
|
-
assert.deepStrictEqual(inspect(parser('((a))#b')), [['<sup class="annotation"><span>a</span></sup>', '<a href="/hashtags/b"
|
|
238
|
-
assert.deepStrictEqual(inspect(parser('[[a]]#b')), [['<sup class="reference"><span>a</span></sup>', '<a href="/hashtags/b"
|
|
239
|
-
assert.deepStrictEqual(inspect(parser('[#a')), [['', '[', '<a href="/hashtags/a"
|
|
240
|
-
assert.deepStrictEqual(inspect(parser('|#a')), [['|', '<a href="/hashtags/a"
|
|
241
|
-
assert.deepStrictEqual(inspect(parser(' #a')), [[' ', '<a href="/hashtags/a"
|
|
233
|
+
assert.deepStrictEqual(inspect(parser('「#あ」')), [['「', '<a class="hashtag" href="/hashtags/あ">#あ</a>', '」'], '']);
|
|
234
|
+
assert.deepStrictEqual(inspect(parser('a\n#b')), [['a', '<br>', '<a class="hashtag" href="/hashtags/b">#b</a>'], '']);
|
|
235
|
+
assert.deepStrictEqual(inspect(parser('a\\\n#b')), [['a', '<span class="linebreak"> </span>', '<a class="hashtag" href="/hashtags/b">#b</a>'], '']);
|
|
236
|
+
assert.deepStrictEqual(inspect(parser('*a*#b')), [['<em>a</em>', '<a class="hashtag" href="/hashtags/b">#b</a>'], '']);
|
|
237
|
+
assert.deepStrictEqual(inspect(parser('((a))#b')), [['<sup class="annotation"><span>a</span></sup>', '<a class="hashtag" href="/hashtags/b">#b</a>'], '']);
|
|
238
|
+
assert.deepStrictEqual(inspect(parser('[[a]]#b')), [['<sup class="reference"><span>a</span></sup>', '<a class="hashtag" href="/hashtags/b">#b</a>'], '']);
|
|
239
|
+
assert.deepStrictEqual(inspect(parser('[#a')), [['', '[', '<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
|
|
240
|
+
assert.deepStrictEqual(inspect(parser('|#a')), [['|', '<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
|
|
241
|
+
assert.deepStrictEqual(inspect(parser(' #a')), [[' ', '<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
|
|
242
242
|
});
|
|
243
243
|
|
|
244
244
|
it('hashnum', () => {
|
|
@@ -4,7 +4,7 @@ import { inspect } from '../debug.test';
|
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/locale', () => {
|
|
6
6
|
describe('locale', () => {
|
|
7
|
-
const parser = (source: string) => some(block)(source, {});
|
|
7
|
+
const parser = (source: string) => some(block)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('basic', () => {
|
|
10
10
|
assert.deepStrictEqual(inspect(parser('。\\\n0')), [['<p>。<span class="linebreak"></span>0</p>'], '']);
|
package/src/parser/segment.ts
CHANGED
|
@@ -26,7 +26,7 @@ export function* segment(source: string): Generator<string, undefined, undefined
|
|
|
26
26
|
if (!validate(source, MAX_INPUT_SIZE)) return yield `\x07Too large input over ${MAX_INPUT_SIZE.toLocaleString('en')} bytes.\n${source.slice(0, 1001)}`;
|
|
27
27
|
assert(source.length < Number.MAX_SAFE_INTEGER);
|
|
28
28
|
while (source !== '') {
|
|
29
|
-
const result = parser(source, {})!;
|
|
29
|
+
const result = parser({ source, context: {} })!;
|
|
30
30
|
assert(result);
|
|
31
31
|
const rest = exec(result);
|
|
32
32
|
const segs = eval(result).length ? eval(result) : [source.slice(0, source.length - rest.length)];
|
|
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
|
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/source/escsource', () => {
|
|
6
6
|
describe('escsource', () => {
|
|
7
|
-
const parser = (source: string) => some(escsource)(source, {});
|
|
7
|
+
const parser = (source: string) => some(escsource)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('invalid', () => {
|
|
10
10
|
assert.deepStrictEqual(inspect(parser('')), undefined);
|
|
@@ -4,7 +4,7 @@ import { nonWhitespace } from './text';
|
|
|
4
4
|
|
|
5
5
|
const delimiter = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
|
|
6
6
|
|
|
7
|
-
export const escsource: EscapableSourceParser = creation(source => {
|
|
7
|
+
export const escsource: EscapableSourceParser = creation(({ source }) => {
|
|
8
8
|
if (source === '') return;
|
|
9
9
|
const i = source.search(delimiter);
|
|
10
10
|
switch (i) {
|
|
@@ -3,7 +3,7 @@ import { inspect } from '../../debug.test';
|
|
|
3
3
|
|
|
4
4
|
describe('Unit: parser/source/line', () => {
|
|
5
5
|
describe('contentline', () => {
|
|
6
|
-
const parser = (source: string) => contentline(source, {});
|
|
6
|
+
const parser = (source: string) => contentline({ source, context: {} });
|
|
7
7
|
|
|
8
8
|
it('invalid', () => {
|
|
9
9
|
assert.deepStrictEqual(inspect(parser('')), undefined);
|
|
@@ -3,5 +3,5 @@ import { AnyLineParser, EmptyLineParser, ContentLineParser } from '../source';
|
|
|
3
3
|
import { line, isEmpty } from '../../combinator';
|
|
4
4
|
|
|
5
5
|
export const anyline: AnyLineParser = line(() => [[], '']);
|
|
6
|
-
export const emptyline: EmptyLineParser = line(
|
|
7
|
-
export const contentline: ContentLineParser = line(
|
|
6
|
+
export const emptyline: EmptyLineParser = line(i => isEmpty(i.source) ? [[], ''] : undefined);
|
|
7
|
+
export const contentline: ContentLineParser = line(i => !isEmpty(i.source) ? [[], ''] : undefined);
|
package/src/parser/source/str.ts
CHANGED
|
@@ -7,13 +7,13 @@ export function str(pattern: string | RegExp): StrParser;
|
|
|
7
7
|
export function str(pattern: string | RegExp): Parser<string, Context<StrParser>, []> {
|
|
8
8
|
assert(pattern);
|
|
9
9
|
return typeof pattern === 'string'
|
|
10
|
-
? creation(source => {
|
|
10
|
+
? creation(({ source }) => {
|
|
11
11
|
if (source === '') return;
|
|
12
12
|
return source.slice(0, pattern.length) === pattern
|
|
13
13
|
? [[pattern], source.slice(pattern.length)]
|
|
14
14
|
: undefined;
|
|
15
15
|
})
|
|
16
|
-
: creation(source => {
|
|
16
|
+
: creation(({ source }) => {
|
|
17
17
|
if (source === '') return;
|
|
18
18
|
const m = source.match(pattern);
|
|
19
19
|
return m && m[0].length > 0
|
|
@@ -26,13 +26,13 @@ export function stropt(pattern: string | RegExp): StrParser;
|
|
|
26
26
|
export function stropt(pattern: string | RegExp): Parser<string, Context<StrParser>, []> {
|
|
27
27
|
assert(pattern);
|
|
28
28
|
return typeof pattern === 'string'
|
|
29
|
-
? creation(source => {
|
|
29
|
+
? creation(({ source }) => {
|
|
30
30
|
if (source === '') return;
|
|
31
31
|
return source.slice(0, pattern.length) === pattern
|
|
32
32
|
? [[pattern], source.slice(pattern.length)]
|
|
33
33
|
: undefined;
|
|
34
34
|
})
|
|
35
|
-
: creation(source => {
|
|
35
|
+
: creation(({ source }) => {
|
|
36
36
|
if (source === '') return;
|
|
37
37
|
const m = source.match(pattern);
|
|
38
38
|
return m
|
|
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
|
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/text/text', () => {
|
|
6
6
|
describe('text', () => {
|
|
7
|
-
const parser = (source: string) => some(text)(source, {});
|
|
7
|
+
const parser = (source: string) => some(text)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('invalid', () => {
|
|
10
10
|
assert.deepStrictEqual(inspect(parser('')), undefined);
|
|
@@ -10,7 +10,7 @@ export const nonWhitespace = /[\S\n]|$/;
|
|
|
10
10
|
export const nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/;
|
|
11
11
|
const repeat = str(/^(.)\1*/);
|
|
12
12
|
|
|
13
|
-
export const text: TextParser = syntax(Syntax.none, 1, 1, State.none, (source, context) => {
|
|
13
|
+
export const text: TextParser = syntax(Syntax.none, 1, 1, State.none, ({ source, context }) => {
|
|
14
14
|
if (source === '') return;
|
|
15
15
|
const i = source.search(delimiter);
|
|
16
16
|
switch (i) {
|
|
@@ -26,7 +26,7 @@ export const text: TextParser = syntax(Syntax.none, 1, 1, State.none, (source, c
|
|
|
26
26
|
case '!':
|
|
27
27
|
case '?':
|
|
28
28
|
assert(source[0] !== '\x1B');
|
|
29
|
-
return text(source.slice(1), context);
|
|
29
|
+
return text({ source: source.slice(1), context });
|
|
30
30
|
}
|
|
31
31
|
break;
|
|
32
32
|
case '、':
|
|
@@ -57,7 +57,7 @@ export const text: TextParser = syntax(Syntax.none, 1, 1, State.none, (source, c
|
|
|
57
57
|
case '=':
|
|
58
58
|
case '`':
|
|
59
59
|
return source[1] === source[0]
|
|
60
|
-
? repeat(source, context)
|
|
60
|
+
? repeat({ source, context })
|
|
61
61
|
: [[source[0]], source.slice(1)];
|
|
62
62
|
default:
|
|
63
63
|
assert(source[0] !== '\n');
|
|
@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
|
|
|
4
4
|
|
|
5
5
|
describe('Unit: parser/source/unescapable', () => {
|
|
6
6
|
describe('unescsource', () => {
|
|
7
|
-
const parser = (source: string) => some(unescsource)(source, {});
|
|
7
|
+
const parser = (source: string) => some(unescsource)({ source, context: {} });
|
|
8
8
|
|
|
9
9
|
it('invalid', () => {
|
|
10
10
|
assert.deepStrictEqual(inspect(parser('')), undefined);
|
|
@@ -2,7 +2,7 @@ import { UnescapableSourceParser } from '../source';
|
|
|
2
2
|
import { creation } from '../../combinator';
|
|
3
3
|
import { delimiter, nonWhitespace, nonAlphanumeric, isAlphanumeric } from './text';
|
|
4
4
|
|
|
5
|
-
export const unescsource: UnescapableSourceParser = creation(source => {
|
|
5
|
+
export const unescsource: UnescapableSourceParser = creation(({ source }) => {
|
|
6
6
|
assert(source[0] !== '\x1B');
|
|
7
7
|
if (source === '') return;
|
|
8
8
|
const i = source.search(delimiter);
|
package/src/parser/visibility.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { undefined } from 'spica/global';
|
|
2
2
|
import { MarkdownParser } from '../../markdown';
|
|
3
|
-
import { Parser, eval } from '../combinator/data/parser';
|
|
3
|
+
import { Parser, Input, eval } from '../combinator/data/parser';
|
|
4
4
|
import { union, some, verify, convert, fmap } from '../combinator';
|
|
5
5
|
import { unsafehtmlentity } from './inline/htmlentity';
|
|
6
6
|
import { linebreak, unescsource } from './source';
|
|
@@ -56,23 +56,23 @@ export function blankWith(starting: '' | '\n', delimiter?: string | RegExp): Reg
|
|
|
56
56
|
|
|
57
57
|
export function startLoose<P extends Parser<HTMLElement | string>>(parser: P, except?: string): P;
|
|
58
58
|
export function startLoose<T extends HTMLElement | string>(parser: Parser<T>, except?: string): Parser<T> {
|
|
59
|
-
return
|
|
60
|
-
isStartLoose(
|
|
61
|
-
? parser(
|
|
59
|
+
return input =>
|
|
60
|
+
isStartLoose(input, except)
|
|
61
|
+
? parser(input)
|
|
62
62
|
: undefined;
|
|
63
63
|
}
|
|
64
|
-
const isStartLoose = reduce((source
|
|
65
|
-
return isStartTight(source.replace(regBlankStart, ''), context, except);
|
|
66
|
-
}, (source
|
|
64
|
+
const isStartLoose = reduce(({ source, context }: Input<MarkdownParser.Context>, except?: string): boolean => {
|
|
65
|
+
return isStartTight({ source: source.replace(regBlankStart, ''), context }, except);
|
|
66
|
+
}, ({ source }, except = '') => `${source}\x1E${except}`);
|
|
67
67
|
|
|
68
68
|
export function startTight<P extends Parser<unknown>>(parser: P, except?: string): P;
|
|
69
69
|
export function startTight<T>(parser: Parser<T>, except?: string): Parser<T> {
|
|
70
|
-
return
|
|
71
|
-
isStartTight(
|
|
72
|
-
? parser(
|
|
70
|
+
return input =>
|
|
71
|
+
isStartTight(input, except)
|
|
72
|
+
? parser(input)
|
|
73
73
|
: undefined;
|
|
74
74
|
}
|
|
75
|
-
const isStartTight = reduce((source
|
|
75
|
+
const isStartTight = reduce(({ source, context }: Input<MarkdownParser.Context>, except?: string): boolean => {
|
|
76
76
|
if (source === '') return true;
|
|
77
77
|
if (except && source.slice(0, except.length) === except) return false;
|
|
78
78
|
switch (source[0]) {
|
|
@@ -87,7 +87,7 @@ const isStartTight = reduce((source: string, context: MarkdownParser.Context, ex
|
|
|
87
87
|
switch (true) {
|
|
88
88
|
case source.length > 2
|
|
89
89
|
&& source[1] !== ' '
|
|
90
|
-
&& eval(unsafehtmlentity(source, context))?.[0]?.trimStart() === '':
|
|
90
|
+
&& eval(unsafehtmlentity({ source, context }))?.[0]?.trimStart() === '':
|
|
91
91
|
return false;
|
|
92
92
|
}
|
|
93
93
|
return true;
|
|
@@ -102,7 +102,7 @@ const isStartTight = reduce((source: string, context: MarkdownParser.Context, ex
|
|
|
102
102
|
default:
|
|
103
103
|
return source[0].trimStart() !== '';
|
|
104
104
|
}
|
|
105
|
-
}, (source
|
|
105
|
+
}, ({ source }, except = '') => `${source}\x1E${except}`);
|
|
106
106
|
|
|
107
107
|
export function isStartLooseNodes(nodes: readonly (HTMLElement | string)[]): boolean {
|
|
108
108
|
if (nodes.length === 0) return true;
|
|
@@ -37,7 +37,13 @@ export function twitter(source: HTMLImageElement, url: URL): HTMLElement | undef
|
|
|
37
37
|
},
|
|
38
38
|
error({ status, statusText }) {
|
|
39
39
|
assert(Number.isSafeInteger(status));
|
|
40
|
-
define(el, [
|
|
40
|
+
define(el, [
|
|
41
|
+
define(parse(`{ ${source.getAttribute('data-src')} }`).querySelector('a')!, {
|
|
42
|
+
class: null,
|
|
43
|
+
target: '_blank',
|
|
44
|
+
}),
|
|
45
|
+
h('pre', `${status}\n${statusText}`),
|
|
46
|
+
]);
|
|
41
47
|
},
|
|
42
48
|
});
|
|
43
49
|
return el;
|
package/src/util/info.ts
CHANGED
|
@@ -6,10 +6,8 @@ import { push } from 'spica/array';
|
|
|
6
6
|
export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info {
|
|
7
7
|
const match = scope(source, '.invalid');
|
|
8
8
|
return {
|
|
9
|
-
url: find
|
|
10
|
-
|
|
11
|
-
tel: find<HTMLAnchorElement>('a:not(:is(.email, .account, .channel, .hashtag, .hashnum, .anchor))')
|
|
12
|
-
.filter(el => ['tel:'].includes(el.protocol)),
|
|
9
|
+
url: find('a.link, a.url'),
|
|
10
|
+
tel: find('a.tel'),
|
|
13
11
|
email: find('a.email'),
|
|
14
12
|
account: find('a.account'),
|
|
15
13
|
channel: find('a.channel'),
|