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
|
@@ -2,7 +2,6 @@ import { EmphasisParser } from '../inline';
|
|
|
2
2
|
import { Recursion } from '../context';
|
|
3
3
|
import { union, some, recursion, precedence, surround, open, lazy } from '../../combinator';
|
|
4
4
|
import { inline } from '../inline';
|
|
5
|
-
import { emstrong } from './emstrong';
|
|
6
5
|
import { strong } from './strong';
|
|
7
6
|
import { str } from '../source';
|
|
8
7
|
import { tightStart, blankWith } from '../visibility';
|
|
@@ -10,16 +9,12 @@ import { unshift } from 'spica/array';
|
|
|
10
9
|
import { html, defrag } from 'typed-dom/dom';
|
|
11
10
|
|
|
12
11
|
export const emphasis: EmphasisParser = lazy(() => surround(
|
|
13
|
-
str(
|
|
12
|
+
str(/\*(?!\*)/y),
|
|
14
13
|
precedence(0, recursion(Recursion.inline,
|
|
15
14
|
tightStart(some(union([
|
|
16
15
|
strong,
|
|
17
16
|
some(inline, blankWith('*')),
|
|
18
|
-
open(some(inline, '*'),
|
|
19
|
-
emstrong,
|
|
20
|
-
strong,
|
|
21
|
-
emphasis,
|
|
22
|
-
])),
|
|
17
|
+
open(some(inline, '*'), inline),
|
|
23
18
|
]))))),
|
|
24
19
|
str('*'), false,
|
|
25
20
|
([, bs]) => [[html('em', defrag(bs))]],
|
|
@@ -11,11 +11,11 @@ describe('Unit: parser/inline/emstrong', () => {
|
|
|
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('*** ***'), ctx), undefined);
|
|
20
20
|
assert.deepStrictEqual(inspect(parser('*** a***'), ctx), undefined);
|
|
21
21
|
assert.deepStrictEqual(inspect(parser('*** a ***'), ctx), undefined);
|
|
@@ -66,8 +66,8 @@ describe('Unit: parser/inline/emstrong', () => {
|
|
|
66
66
|
assert.deepStrictEqual(inspect(parser('***a*\\ **b****'), ctx), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
|
|
67
67
|
assert.deepStrictEqual(inspect(parser('***a*	**b****'), ctx), [['<strong><em>a</em>\t<strong>b</strong></strong>'], '']);
|
|
68
68
|
assert.deepStrictEqual(inspect(parser('***a*<wbr>**b****'), ctx), [['<strong><em>a</em><wbr><strong>b</strong></strong>'], '']);
|
|
69
|
-
assert.deepStrictEqual(inspect(parser('***a*b **'), ctx), [['**', '<em>a</em>', 'b'], '
|
|
70
|
-
assert.deepStrictEqual(inspect(parser('***a*b\\ **'), ctx), [['**', '<em>a</em>', 'b'], '
|
|
69
|
+
assert.deepStrictEqual(inspect(parser('***a*b **'), ctx), [['**', '<em>a</em>', 'b **'], '']);
|
|
70
|
+
assert.deepStrictEqual(inspect(parser('***a*b\\ **'), ctx), [['**', '<em>a</em>', 'b **'], '']);
|
|
71
71
|
assert.deepStrictEqual(inspect(parser('***a**b*'), ctx), [['<em><strong>a</strong>b</em>'], '']);
|
|
72
72
|
assert.deepStrictEqual(inspect(parser('***a**b*c'), ctx), [['<em><strong>a</strong>b</em>'], 'c']);
|
|
73
73
|
assert.deepStrictEqual(inspect(parser('***a**b*c**'), ctx), [['<em><strong>a</strong>b</em>'], 'c**']);
|
|
@@ -77,8 +77,8 @@ describe('Unit: parser/inline/emstrong', () => {
|
|
|
77
77
|
assert.deepStrictEqual(inspect(parser('***a**\\ *b**'), ctx), [['<em><strong>a</strong> <em>b</em></em>'], '']);
|
|
78
78
|
assert.deepStrictEqual(inspect(parser('***a**	*b**'), ctx), [['<em><strong>a</strong>\t<em>b</em></em>'], '']);
|
|
79
79
|
assert.deepStrictEqual(inspect(parser('***a**<wbr>*b**'), ctx), [['<em><strong>a</strong><wbr><em>b</em></em>'], '']);
|
|
80
|
-
assert.deepStrictEqual(inspect(parser('***a**b *'), ctx), [['*', '<strong>a</strong>', 'b'], '
|
|
81
|
-
assert.deepStrictEqual(inspect(parser('***a**b\\ *'), ctx), [['*', '<strong>a</strong>', 'b'], '
|
|
80
|
+
assert.deepStrictEqual(inspect(parser('***a**b *'), ctx), [['*', '<strong>a</strong>', 'b *'], '']);
|
|
81
|
+
assert.deepStrictEqual(inspect(parser('***a**b\\ *'), ctx), [['*', '<strong>a</strong>', 'b *'], '']);
|
|
82
82
|
assert.deepStrictEqual(inspect(parser('***a*'), ctx), [['**', '<em>a</em>'], '']);
|
|
83
83
|
assert.deepStrictEqual(inspect(parser('***a**'), ctx), [['*', '<strong>a</strong>'], '']);
|
|
84
84
|
assert.deepStrictEqual(inspect(parser('***a***'), ctx), [['<em><strong>a</strong></em>'], '']);
|
|
@@ -109,11 +109,11 @@ describe('Unit: parser/inline/emstrong', () => {
|
|
|
109
109
|
assert.deepStrictEqual(inspect(parser('******a******'), ctx), [['<em><strong><em><strong>a</strong></em></strong></em>'], '']);
|
|
110
110
|
assert.deepStrictEqual(inspect(parser('******a******b'), ctx), [['<em><strong><em><strong>a</strong></em></strong></em>'], 'b']);
|
|
111
111
|
assert.deepStrictEqual(inspect(parser('******a*b'), ctx), [['***', '**', '<em>a</em>', 'b'], '']);
|
|
112
|
-
assert.deepStrictEqual(inspect(parser('******a*b *'), ctx), [['***', '**', '<em>a</em>', 'b'], '
|
|
113
|
-
assert.deepStrictEqual(inspect(parser('******a*b **'), ctx), [['***', '**', '<em>a</em>', 'b'], '
|
|
114
|
-
assert.deepStrictEqual(inspect(parser('******a*b ***'), ctx), [['***', '**', '<em>a</em>', 'b'], '
|
|
115
|
-
assert.deepStrictEqual(inspect(parser('******a*b ****'), ctx), [['***', '**', '<em>a</em>', 'b'], '
|
|
116
|
-
assert.deepStrictEqual(inspect(parser('******a*b *****'), ctx), [['***', '**', '<em>a</em>', 'b'], '
|
|
112
|
+
assert.deepStrictEqual(inspect(parser('******a*b *'), ctx), [['***', '**', '<em>a</em>', 'b *'], '']);
|
|
113
|
+
assert.deepStrictEqual(inspect(parser('******a*b **'), ctx), [['***', '**', '<em>a</em>', 'b **'], '']);
|
|
114
|
+
assert.deepStrictEqual(inspect(parser('******a*b ***'), ctx), [['***', '**', '<em>a</em>', 'b ***'], '']);
|
|
115
|
+
assert.deepStrictEqual(inspect(parser('******a*b ****'), ctx), [['***', '**', '<em>a</em>', 'b ****'], '']);
|
|
116
|
+
assert.deepStrictEqual(inspect(parser('******a*b *****'), ctx), [['***', '**', '<em>a</em>', 'b *****'], '']);
|
|
117
117
|
});
|
|
118
118
|
|
|
119
119
|
});
|
|
@@ -14,20 +14,12 @@ import { html, defrag } from 'typed-dom/dom';
|
|
|
14
14
|
const substrong: IntermediateParser<StrongParser> = lazy(() => some(union([
|
|
15
15
|
emphasis,
|
|
16
16
|
some(inline, blankWith('*')),
|
|
17
|
-
open(some(inline, '*'),
|
|
18
|
-
emstrong,
|
|
19
|
-
strong,
|
|
20
|
-
emphasis,
|
|
21
|
-
])),
|
|
17
|
+
open(some(inline, '*'), inline),
|
|
22
18
|
])));
|
|
23
19
|
const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
|
|
24
20
|
strong,
|
|
25
21
|
some(inline, blankWith('*')),
|
|
26
|
-
open(some(inline, '*'),
|
|
27
|
-
emstrong,
|
|
28
|
-
strong,
|
|
29
|
-
emphasis,
|
|
30
|
-
])),
|
|
22
|
+
open(some(inline, '*'), inline),
|
|
31
23
|
])));
|
|
32
24
|
|
|
33
25
|
// 開閉が明示的でない構文は開閉の不明確な記号による再帰的適用を行わず
|
|
@@ -39,13 +31,9 @@ export const emstrong: EmStrongParser = lazy(() => validate('***',
|
|
|
39
31
|
recursion(Recursion.inline,
|
|
40
32
|
tightStart(some(union([
|
|
41
33
|
some(inline, blankWith('*')),
|
|
42
|
-
open(some(inline, '*'),
|
|
43
|
-
emstrong,
|
|
44
|
-
strong,
|
|
45
|
-
emphasis,
|
|
46
|
-
])),
|
|
34
|
+
open(some(inline, '*'), inline),
|
|
47
35
|
])))),
|
|
48
|
-
str(
|
|
36
|
+
str(/\*{1,3}/y), false,
|
|
49
37
|
([, bs, cs], context): Result<Node<EmStrongParser>, Context<EmStrongParser>> => {
|
|
50
38
|
assert(cs.length === 1);
|
|
51
39
|
const { buffer } = context;
|
|
@@ -52,7 +52,7 @@ describe('Unit: parser/inline/extension/index', () => {
|
|
|
52
52
|
assert.deepStrictEqual(inspect(parser('[#a [% b %]]'), ctx), [['<a class="index" href="#index::a">a <span class="remark"><input type="checkbox"><span>[% b %]</span></span></a>'], '']);
|
|
53
53
|
assert.deepStrictEqual(inspect(parser('[#a\\ ]'), ctx), [['<a class="index" href="#index::a">a</a>'], '']);
|
|
54
54
|
assert.deepStrictEqual(inspect(parser('[#a b]'), ctx), [['<a class="index" href="#index::a_b">a b</a>'], '']);
|
|
55
|
-
assert.deepStrictEqual(inspect(parser('[#a b]'), ctx), [['<a class="index" href="#index::
|
|
55
|
+
assert.deepStrictEqual(inspect(parser('[#a b]'), ctx), [['<a class="index" href="#index::a_b">a b</a>'], '']);
|
|
56
56
|
assert.deepStrictEqual(inspect(parser('[#a\tb]'), ctx), [['<a class="index" href="#index::a_b=33Mw2l">a\tb</a>'], '']);
|
|
57
57
|
assert.deepStrictEqual(inspect(parser('[#a_b]'), ctx), [['<a class="index" href="#index::a_b=2H8oCG">a_b</a>'], '']);
|
|
58
58
|
assert.deepStrictEqual(inspect(parser('[#a\\ b]'), ctx), [['<a class="index" href="#index::a_b">a b</a>'], '']);
|
|
@@ -70,7 +70,7 @@ describe('Unit: parser/inline/extension/index', () => {
|
|
|
70
70
|
assert.deepStrictEqual(inspect(parser('[#@a]'), ctx), [['<a class="index" href="#index::@a">@a</a>'], '']);
|
|
71
71
|
assert.deepStrictEqual(inspect(parser('[#http://host]'), ctx), [['<a class="index" href="#index::http://host">http://host</a>'], '']);
|
|
72
72
|
assert.deepStrictEqual(inspect(parser('[#!http://host]'), ctx), [['<a class="index" href="#index::!http://host">!http://host</a>'], '']);
|
|
73
|
-
assert.deepStrictEqual(inspect(parser('[#[% %]]'), ctx), [['<a class="index"><span class="remark"><input type="checkbox"><span>[%
|
|
73
|
+
assert.deepStrictEqual(inspect(parser('[#[% %]]'), ctx), [['<a class="index"><span class="remark"><input type="checkbox"><span>[% %]</span></span></a>'], '']);
|
|
74
74
|
assert.deepStrictEqual(inspect(parser('[#[% a %]]'), ctx), [['<a class="index"><span class="remark"><input type="checkbox"><span>[% a %]</span></span></a>'], '']);
|
|
75
75
|
assert.deepStrictEqual(inspect(parser('[#a((b))]'), ctx), [['<a class="index" href="#index::a((b))">a<span class="paren">((b))</span></a>'], '']);
|
|
76
76
|
assert.deepStrictEqual(inspect(parser('[#a[[b]]]'), ctx), [['<a class="index" href="#index::a[[b]]">a[[b]]</a>'], '']);
|
|
@@ -89,10 +89,12 @@ describe('Unit: parser/inline/extension/index', () => {
|
|
|
89
89
|
assert.deepStrictEqual(inspect(parser('[#a|*b*]'), ctx), [['<a class="index" href="#index::*b*">a<span class="indexer" data-index="*b*"></span></a>'], '']);
|
|
90
90
|
assert.deepStrictEqual(inspect(parser('[#a|*]*]'), ctx), [['<a class="index" href="#index::*">a<span class="indexer" data-index="*"></span></a>'], '*]']);
|
|
91
91
|
assert.deepStrictEqual(inspect(parser('[#a|b c]'), ctx), [['<a class="index" href="#index::b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
|
|
92
|
-
assert.deepStrictEqual(inspect(parser('[#a|b c]'), ctx), [['<a class="index" href="#index::
|
|
92
|
+
assert.deepStrictEqual(inspect(parser('[#a|b c]'), ctx), [['<a class="index" href="#index::b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
|
|
93
93
|
assert.deepStrictEqual(inspect(parser('[#a|b\tc]'), ctx), [['<a class="index" href="#index::b_c=xeqYk">a<span class="indexer" data-index="b_c=xeqYk"></span></a>'], '']);
|
|
94
94
|
assert.deepStrictEqual(inspect(parser('[#a|b_c]'), ctx), [['<a class="index" href="#index::b_c=KUxv5">a<span class="indexer" data-index="b_c=KUxv5"></span></a>'], '']);
|
|
95
95
|
assert.deepStrictEqual(inspect(parser('[#a|\\[\\]]'), ctx), [['<a class="index" href="#index::[]">a<span class="indexer" data-index="[]"></span></a>'], '']);
|
|
96
|
+
assert.deepStrictEqual(inspect(parser('[#a|&]'), ctx), [['<a class="index" href="#index::&">a<span class="indexer" data-index="&"></span></a>'], '']);
|
|
97
|
+
assert.deepStrictEqual(inspect(parser('[#a|©]'), ctx), [['<a class="index" href="#index::&copy">a<span class="indexer" data-index="&copy"></span></a>'], '']);
|
|
96
98
|
assert.deepStrictEqual(inspect(parser('[#a|©]'), ctx), [['<a class="index" href="#index::©">a<span class="indexer" data-index="©"></span></a>'], '']);
|
|
97
99
|
assert.deepStrictEqual(inspect(parser('[#a| ]'), ctx), [['<a class="index" href="#index::a|">a|</a>'], '']);
|
|
98
100
|
assert.deepStrictEqual(inspect(parser('[#a|<wbr>]'), ctx), [['<a class="index" href="#index::a|">a|</a>'], '']);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ExtensionParser } from '../../inline';
|
|
2
2
|
import { State, Backtrack } from '../../context';
|
|
3
|
-
import { union, inits, some, precedence, state, constraint, validate,
|
|
3
|
+
import { union, inits, some, precedence, state, constraint, validate, surround, lazy, fmap } from '../../../combinator';
|
|
4
4
|
import { inline } from '../../inline';
|
|
5
5
|
import { indexee, identity } from './indexee';
|
|
6
6
|
import { unsafehtmlentity } from '../htmlentity';
|
|
@@ -46,15 +46,12 @@ export const index: IndexParser = lazy(() => constraint(State.index, fmap(indexe
|
|
|
46
46
|
})));
|
|
47
47
|
|
|
48
48
|
export const signature: IndexParser.SignatureParser = lazy(() => validate('|', surround(
|
|
49
|
-
str(
|
|
49
|
+
str(/\|(?!\\?\s)/y),
|
|
50
50
|
some(union([
|
|
51
51
|
unsafehtmlentity,
|
|
52
|
-
|
|
53
|
-
/^(?:[^\\[\](){}<>"$`\n]|\\[^\n]?)/,
|
|
54
|
-
txt,
|
|
55
|
-
false),
|
|
52
|
+
some(txt, /(?:[&$[\](){}<>"`]|\\?\n)/y),
|
|
56
53
|
]), ']'),
|
|
57
|
-
|
|
54
|
+
/(?=])/y,
|
|
58
55
|
false,
|
|
59
56
|
([, ns]) => {
|
|
60
57
|
const index = identity('index', undefined, ns.join(''))?.slice(7);
|
|
@@ -26,7 +26,7 @@ describe('Unit: parser/inline/extension/indexer', () => {
|
|
|
26
26
|
assert.deepStrictEqual(inspect(parser(' [|a ]'), ctx), [['<span class="indexer" data-index="a"></span>'], '']);
|
|
27
27
|
assert.deepStrictEqual(inspect(parser(' [|a ]'), ctx), [['<span class="indexer" data-index="a"></span>'], '']);
|
|
28
28
|
assert.deepStrictEqual(inspect(parser(' [|a b]'), ctx), [['<span class="indexer" data-index="a_b"></span>'], '']);
|
|
29
|
-
assert.deepStrictEqual(inspect(parser(' [|a b]'), ctx), [['<span class="indexer" data-index="
|
|
29
|
+
assert.deepStrictEqual(inspect(parser(' [|a b]'), ctx), [['<span class="indexer" data-index="a_b"></span>'], '']);
|
|
30
30
|
assert.deepStrictEqual(inspect(parser(' [|a\tb]'), ctx), [['<span class="indexer" data-index="a_b=33Mw2l"></span>'], '']);
|
|
31
31
|
assert.deepStrictEqual(inspect(parser(' [|a_b]'), ctx), [['<span class="indexer" data-index="a_b=2H8oCG"></span>'], '']);
|
|
32
32
|
assert.deepStrictEqual(inspect(parser(' [|A]'), ctx), [['<span class="indexer" data-index="A"></span>'], '']);
|
|
@@ -10,9 +10,9 @@ import { html } from 'typed-dom/dom';
|
|
|
10
10
|
// 継続的編集において最も簡便となる。
|
|
11
11
|
|
|
12
12
|
export const indexer: ExtensionParser.IndexerParser = surround(
|
|
13
|
-
|
|
13
|
+
/\s+\[(?=\|\S)/y,
|
|
14
14
|
union([
|
|
15
15
|
signature,
|
|
16
|
-
focus(
|
|
16
|
+
focus(/\|(?=\])/y, () => [[html('span', { class: 'indexer', 'data-index': '' })]]),
|
|
17
17
|
]),
|
|
18
|
-
|
|
18
|
+
/\]\s*$/y);
|
|
@@ -4,7 +4,7 @@ import { union, constraint, clear, surround, fmap } from '../../../combinator';
|
|
|
4
4
|
import { str } from '../../source';
|
|
5
5
|
import { html } from 'typed-dom/dom';
|
|
6
6
|
|
|
7
|
-
const body = str(
|
|
7
|
+
const body = str(/\$[A-Za-z]*(?:(?:-[A-Za-z][0-9A-Za-z]*)+|-(?:(?:0|[1-9][0-9]*)\.)*(?:0|[1-9][0-9]*)(?![0-9A-Za-z]))/y);
|
|
8
8
|
|
|
9
9
|
export const segment: ExtensionParser.LabelParser.SegmentParser = clear(union([
|
|
10
10
|
surround('[', body, ']'),
|
|
@@ -14,7 +14,7 @@ import { html } from 'typed-dom/dom';
|
|
|
14
14
|
|
|
15
15
|
export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => surround(
|
|
16
16
|
// ^はabbrで使用済みだが^:などのようにして分離使用可能
|
|
17
|
-
str(
|
|
17
|
+
str(/\[[:^|]/y),
|
|
18
18
|
precedence(1, recursion(Recursion.inline,
|
|
19
19
|
tightStart(some(union([inline]), ']', [[']', 1]])))),
|
|
20
20
|
str(']'), false,
|
|
@@ -70,13 +70,13 @@ describe('Unit: parser/inline/html', () => {
|
|
|
70
70
|
assert.deepStrictEqual(inspect(parser('<bdi >a</bdi>'), ctx), [['<bdi>a</bdi>'], '']);
|
|
71
71
|
assert.deepStrictEqual(inspect(parser('<bdi> a</bdi>'), ctx), [['<bdi> a</bdi>'], '']);
|
|
72
72
|
assert.deepStrictEqual(inspect(parser('<bdi> a </bdi>'), ctx), [['<bdi> a </bdi>'], '']);
|
|
73
|
-
assert.deepStrictEqual(inspect(parser('<bdi> a </bdi>'), ctx), [['<bdi>
|
|
73
|
+
assert.deepStrictEqual(inspect(parser('<bdi> a </bdi>'), ctx), [['<bdi> a </bdi>'], '']);
|
|
74
74
|
assert.deepStrictEqual(inspect(parser('<bdi>\\ a</bdi>'), ctx), [['<bdi> a</bdi>'], '']);
|
|
75
75
|
assert.deepStrictEqual(inspect(parser('<bdi><wbr>a</bdi>'), ctx), [['<bdi><wbr>a</bdi>'], '']);
|
|
76
76
|
assert.deepStrictEqual(inspect(parser('<bdi>a</bdi>'), ctx), [['<bdi>a</bdi>'], '']);
|
|
77
77
|
assert.deepStrictEqual(inspect(parser('<bdi>a</bdi>a'), ctx), [['<bdi>a</bdi>'], 'a']);
|
|
78
78
|
assert.deepStrictEqual(inspect(parser('<bdi>a </bdi>'), ctx), [['<bdi>a </bdi>'], '']);
|
|
79
|
-
assert.deepStrictEqual(inspect(parser('<bdi>a \n </bdi>'), ctx), [['<bdi>a
|
|
79
|
+
assert.deepStrictEqual(inspect(parser('<bdi>a \n </bdi>'), ctx), [['<bdi>a </bdi>'], '']);
|
|
80
80
|
assert.deepStrictEqual(inspect(parser('<bdi>a\n</bdi>'), ctx), [['<bdi>a</bdi>'], '']);
|
|
81
81
|
assert.deepStrictEqual(inspect(parser('<bdi>a\n </bdi>'), ctx), [['<bdi>a </bdi>'], '']);
|
|
82
82
|
assert.deepStrictEqual(inspect(parser('<bdi>a\n<wbr></bdi>'), ctx), [['<bdi>a<wbr></bdi>'], '']);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { HTMLParser } from '../inline';
|
|
2
2
|
import { Recursion } from '../context';
|
|
3
3
|
import { Ctx } from '../../combinator/data/parser';
|
|
4
|
-
import { union,
|
|
4
|
+
import { union, some, recursion, precedence, validate, surround, open, match, lazy } from '../../combinator';
|
|
5
5
|
import { inline } from '../inline';
|
|
6
6
|
import { str } from '../source';
|
|
7
7
|
import { isLooseNodeStart, blankWith } from '../visibility';
|
|
@@ -20,33 +20,33 @@ const attrspecs = {
|
|
|
20
20
|
Object.setPrototypeOf(attrspecs, null);
|
|
21
21
|
Object.values(attrspecs).forEach(o => Object.setPrototypeOf(o, null));
|
|
22
22
|
|
|
23
|
-
export const html: HTMLParser = lazy(() => validate(
|
|
23
|
+
export const html: HTMLParser = lazy(() => validate(/<[a-z]+(?=[^\S\n]|>)/yi,
|
|
24
24
|
union([
|
|
25
25
|
surround(
|
|
26
26
|
// https://html.spec.whatwg.org/multipage/syntax.html#void-elements
|
|
27
|
-
str(
|
|
27
|
+
str(/<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[^\S\n]|>)/yi),
|
|
28
28
|
some(union([attribute])),
|
|
29
|
-
open(str(
|
|
29
|
+
open(str(/[^\S\n]*/y), str('>'), true),
|
|
30
30
|
true,
|
|
31
31
|
([as, bs = [], cs], context) =>
|
|
32
32
|
[[elem(as[0].slice(1), false, push(unshift(as, bs), cs), [], [], context)]],
|
|
33
33
|
([as, bs = []], context) =>
|
|
34
34
|
[[elem(as[0].slice(1), false, unshift(as, bs), [], [], context)]]),
|
|
35
35
|
match(
|
|
36
|
-
new RegExp(String.raw
|
|
36
|
+
new RegExp(String.raw`<(${TAGS.join('|')})(?=[^\S\n]|>)`, 'y'),
|
|
37
37
|
memoize(
|
|
38
38
|
([, tag]) =>
|
|
39
39
|
surround<HTMLParser.TagParser, string>(
|
|
40
40
|
surround(
|
|
41
|
-
str(`<${tag}`), some(attribute), open(str(
|
|
41
|
+
str(`<${tag}`), some(attribute), open(str(/[^\S\n]*/y), str('>'), true),
|
|
42
42
|
true,
|
|
43
43
|
([as, bs = [], cs]) => [push(unshift(as, bs), cs)],
|
|
44
44
|
([as, bs = []]) => [unshift(as, bs)]),
|
|
45
45
|
precedence(3, recursion(Recursion.inline,
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
]))),
|
|
46
|
+
some(union([
|
|
47
|
+
some(inline, blankWith('\n', `</${tag}>`), [[blankWith('\n', `</${tag}>`), 3]]),
|
|
48
|
+
open('\n', some(inline, `</${tag}>`, [[`</${tag}>`, 3]]), true),
|
|
49
|
+
])))),
|
|
50
50
|
str(`</${tag}>`),
|
|
51
51
|
true,
|
|
52
52
|
([as, bs = [], cs], context) =>
|
|
@@ -57,9 +57,9 @@ export const html: HTMLParser = lazy(() => validate(/^<[a-z]+(?=[^\S\n]|>)/i,
|
|
|
57
57
|
new Map())),
|
|
58
58
|
surround(
|
|
59
59
|
// https://html.spec.whatwg.org/multipage/syntax.html#void-elements
|
|
60
|
-
str(
|
|
60
|
+
str(/<[a-z]+(?=[^\S\n]|>)/yi),
|
|
61
61
|
some(union([attribute])),
|
|
62
|
-
open(str(
|
|
62
|
+
open(str(/[^\S\n]*/y), str('>'), true),
|
|
63
63
|
true,
|
|
64
64
|
([as, bs = [], cs], context) =>
|
|
65
65
|
[[elem(as[0].slice(1), false, push(unshift(as, bs), cs), [], [], context)]],
|
|
@@ -68,8 +68,8 @@ export const html: HTMLParser = lazy(() => validate(/^<[a-z]+(?=[^\S\n]|>)/i,
|
|
|
68
68
|
])));
|
|
69
69
|
|
|
70
70
|
export const attribute: HTMLParser.AttributeParser = union([
|
|
71
|
-
str(
|
|
72
|
-
str(
|
|
71
|
+
str(/[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|>)/yi),
|
|
72
|
+
str(/[^\S\n]+[^\s<>]+/y),
|
|
73
73
|
]);
|
|
74
74
|
|
|
75
75
|
function elem(tag: string, content: boolean, as: string[], bs: (HTMLElement | string)[], cs: string[], context: Ctx): HTMLElement {
|
|
@@ -4,7 +4,7 @@ import { invalid } from '../util';
|
|
|
4
4
|
import { html } from 'typed-dom/dom';
|
|
5
5
|
|
|
6
6
|
export const unsafehtmlentity: UnsafeHTMLEntityParser = validate('&', focus(
|
|
7
|
-
|
|
7
|
+
/&(?:[0-9A-Za-z]+;?)?/y,
|
|
8
8
|
//({ source }) => [[parser(source) ?? `${Command.Error}${source}`], '']));
|
|
9
9
|
({ context }) => {
|
|
10
10
|
const { source } = context;
|
|
@@ -23,12 +23,12 @@ describe('Unit: parser/inline/insertion', () => {
|
|
|
23
23
|
assert.deepStrictEqual(inspect(parser('++ ++'), ctx), [['<ins> </ins>'], '']);
|
|
24
24
|
assert.deepStrictEqual(inspect(parser('++ a++'), ctx), [['<ins> a</ins>'], '']);
|
|
25
25
|
assert.deepStrictEqual(inspect(parser('++ a ++'), ctx), [['<ins> a </ins>'], '']);
|
|
26
|
-
assert.deepStrictEqual(inspect(parser('++ a ++'), ctx), [['<ins>
|
|
26
|
+
assert.deepStrictEqual(inspect(parser('++ a ++'), ctx), [['<ins> a </ins>'], '']);
|
|
27
27
|
assert.deepStrictEqual(inspect(parser('++\na++'), ctx), [['<ins><br>a</ins>'], '']);
|
|
28
28
|
assert.deepStrictEqual(inspect(parser('++\\\na++'), ctx), [['<ins><br>a</ins>'], '']);
|
|
29
29
|
assert.deepStrictEqual(inspect(parser('++<wbr>a++'), ctx), [['<ins><wbr>a</ins>'], '']);
|
|
30
30
|
assert.deepStrictEqual(inspect(parser('++a ++'), ctx), [['<ins>a </ins>'], '']);
|
|
31
|
-
assert.deepStrictEqual(inspect(parser('++a \n ++'), ctx), [['<ins>a
|
|
31
|
+
assert.deepStrictEqual(inspect(parser('++a \n ++'), ctx), [['<ins>a </ins>'], '']);
|
|
32
32
|
assert.deepStrictEqual(inspect(parser('++a\n++'), ctx), [['<ins>a</ins>'], '']);
|
|
33
33
|
assert.deepStrictEqual(inspect(parser('++a\n ++'), ctx), [['<ins>a </ins>'], '']);
|
|
34
34
|
assert.deepStrictEqual(inspect(parser('++a\n<wbr>++'), ctx), [['<ins>a<wbr></ins>'], '']);
|
|
@@ -13,7 +13,7 @@ export const insertion: InsertionParser = 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/italic', () => {
|
|
|
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('///a//b'), ctx), [['///', 'a', '/', '/', 'b'], '']);
|
|
21
21
|
assert.deepStrictEqual(inspect(parser('///a*b///'), ctx), [['///', 'a', '*', 'b', '/', '/', '/'], '']);
|
|
@@ -16,7 +16,7 @@ export const italic: ItalicParser = lazy(() => validate('///',
|
|
|
16
16
|
recursion(Recursion.inline,
|
|
17
17
|
tightStart(some(union([
|
|
18
18
|
some(inline, blankWith('///')),
|
|
19
|
-
open(some(inline, '/'),
|
|
19
|
+
open(some(inline, '/'), inline),
|
|
20
20
|
])))),
|
|
21
21
|
'///', false,
|
|
22
22
|
([, bs], { buffer }) => [push(buffer!, bs)],
|
|
@@ -4,7 +4,7 @@ import { State, Backtrack, Command } from '../context';
|
|
|
4
4
|
import { union, inits, tails, sequence, subsequence, some, creation, precedence, state, constraint, validate, surround, open, setBacktrack, dup, reverse, lazy, fmap, bind } from '../../combinator';
|
|
5
5
|
import { inline, media, shortmedia } from '../inline';
|
|
6
6
|
import { attributes } from './html';
|
|
7
|
-
import {
|
|
7
|
+
import { unescsource, str } from '../source';
|
|
8
8
|
import { trimBlankStart, trimBlankNodeEnd } from '../visibility';
|
|
9
9
|
import { invalid, stringify } from '../util';
|
|
10
10
|
import { ReadonlyURL } from 'spica/url';
|
|
@@ -33,9 +33,9 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => constraint(State.l
|
|
|
33
33
|
// `{ `と`{`で個別にバックトラックが発生し+1nされる。
|
|
34
34
|
// 自己再帰的にパースしてもオプションの不要なパースによる計算量の増加により相殺される。
|
|
35
35
|
dup(surround(
|
|
36
|
-
|
|
36
|
+
/{(?![{}])/y,
|
|
37
37
|
inits([uri, some(option)]),
|
|
38
|
-
|
|
38
|
+
/[^\S\n]*}/y,
|
|
39
39
|
false,
|
|
40
40
|
undefined,
|
|
41
41
|
([as, bs], context) => {
|
|
@@ -75,22 +75,22 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => constraint(State.l
|
|
|
75
75
|
return [[parse(defrag(content), params, context)]];
|
|
76
76
|
}))))));
|
|
77
77
|
|
|
78
|
-
export const medialink: LinkParser.MediaLinkParser = lazy(() => constraint(State.link | State.media, validate([
|
|
78
|
+
export const medialink: LinkParser.MediaLinkParser = lazy(() => constraint(State.link | State.media, validate(/[[{]/y, creation(10,
|
|
79
79
|
state(State.linkers,
|
|
80
80
|
bind(reverse(sequence([
|
|
81
81
|
dup(surround(
|
|
82
82
|
'[',
|
|
83
83
|
union([media, shortmedia]),
|
|
84
84
|
']')),
|
|
85
|
-
dup(surround(
|
|
85
|
+
dup(surround(/{(?![{}])/y, inits([uri, some(option)]), /[^\S\n]*}/y)),
|
|
86
86
|
])),
|
|
87
87
|
([params, content = []]: [string[], (HTMLElement | string)[]], context) =>
|
|
88
88
|
[[parse(defrag(content), params, context)]]))))));
|
|
89
89
|
|
|
90
90
|
export const linemedialink: LinkParser.LineMediaLinkParser = surround(
|
|
91
|
-
|
|
91
|
+
/(?<=^|[\r\n])/y,
|
|
92
92
|
union([medialink]),
|
|
93
|
-
|
|
93
|
+
/(?=[^\S\n]*(?:$|\n))/y);
|
|
94
94
|
|
|
95
95
|
export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() =>
|
|
96
96
|
creation(10,
|
|
@@ -99,20 +99,20 @@ export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() =>
|
|
|
99
99
|
'[',
|
|
100
100
|
some(union([unescsource]), ']'),
|
|
101
101
|
']')),
|
|
102
|
-
dup(surround(
|
|
102
|
+
dup(surround(/{(?![{}])/y, inits([uri, some(option)]), /[^\S\n]*}/y)),
|
|
103
103
|
])),
|
|
104
104
|
([params, content = []], context) =>
|
|
105
105
|
[[parse(defrag(content), params, context)]])));
|
|
106
106
|
|
|
107
107
|
export const uri: LinkParser.ParameterParser.UriParser = union([
|
|
108
|
-
open(
|
|
109
|
-
str(
|
|
108
|
+
open(/[^\S\n]+/y, str(/\S+/y)),
|
|
109
|
+
str(/[^\s{}]+/y),
|
|
110
110
|
]);
|
|
111
111
|
|
|
112
112
|
export const option: LinkParser.ParameterParser.OptionParser = union([
|
|
113
|
-
fmap(str(
|
|
114
|
-
str(
|
|
115
|
-
str(
|
|
113
|
+
fmap(str(/[^\S\n]+nofollow(?=[^\S\n]|})/y), () => [` rel="nofollow"`]),
|
|
114
|
+
str(/[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|})/yi),
|
|
115
|
+
str(/[^\S\n]+[^\s{}]+/y),
|
|
116
116
|
]);
|
|
117
117
|
|
|
118
118
|
function parse(
|
|
@@ -248,10 +248,10 @@ export function resolve(uri: string, host: URL | Location, source: URL | Locatio
|
|
|
248
248
|
}
|
|
249
249
|
|
|
250
250
|
export function decode(uri: string): string {
|
|
251
|
-
const origin = uri.match(
|
|
251
|
+
const origin = uri.match(/[a-z](?:[-.](?=[0-9a-z])|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/yi)?.[0] ?? '';
|
|
252
252
|
try {
|
|
253
253
|
let path = decodeURI(uri.slice(origin.length));
|
|
254
|
-
if (!origin &&
|
|
254
|
+
if (!origin && /[a-z](?:[-.](?=[0-9a-z])|[0-9a-z])*:\/{0,2}\S/yi.test(path)) {
|
|
255
255
|
path = uri.slice(origin.length);
|
|
256
256
|
}
|
|
257
257
|
uri = origin + path;
|
|
@@ -14,11 +14,11 @@ describe('Unit: parser/inline/mark', () => {
|
|
|
14
14
|
assert.deepStrictEqual(inspect(parser('=='), ctx), undefined);
|
|
15
15
|
assert.deepStrictEqual(inspect(parser('==a'), ctx), [['==', 'a'], '']);
|
|
16
16
|
assert.deepStrictEqual(inspect(parser('==a='), ctx), [['==', 'a', '='], '']);
|
|
17
|
-
assert.deepStrictEqual(inspect(parser('==a =='), ctx), [['==', 'a'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser('==a =='), ctx), [['==', 'a', ' '
|
|
19
|
-
assert.deepStrictEqual(inspect(parser('==a\n=='), ctx), [['==', 'a'], '
|
|
20
|
-
assert.deepStrictEqual(inspect(parser('==a\\ =='), ctx), [['==', 'a'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser('==a\\\n=='), ctx), [['==', 'a'], '
|
|
17
|
+
assert.deepStrictEqual(inspect(parser('==a =='), ctx), [['==', 'a', ' ', '=', '='], '']);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser('==a =='), ctx), [['==', 'a', ' ', '=', '='], '']);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser('==a\n=='), ctx), [['==', 'a', '<br>', '=', '='], '']);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser('==a\\ =='), ctx), [['==', 'a', ' ', '=', '='], '']);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser('==a\\\n=='), ctx), [['==', 'a', '<br>', '=', '='], '']);
|
|
22
22
|
assert.deepStrictEqual(inspect(parser('== =='), ctx), undefined);
|
|
23
23
|
assert.deepStrictEqual(inspect(parser('== a=='), ctx), undefined);
|
|
24
24
|
assert.deepStrictEqual(inspect(parser('== a =='), ctx), undefined);
|
|
@@ -14,7 +14,7 @@ export const mark: MarkParser = lazy(() => constraint(State.linkers & ~State.mar
|
|
|
14
14
|
recursion(Recursion.inline,
|
|
15
15
|
tightStart(some(union([
|
|
16
16
|
some(inline, blankWith('==')),
|
|
17
|
-
open(some(inline, '='),
|
|
17
|
+
open(some(inline, '='), inline),
|
|
18
18
|
])))),
|
|
19
19
|
'==', false,
|
|
20
20
|
([, bs], { buffer }) => [push(buffer!, bs)],
|
|
@@ -31,10 +31,8 @@ describe('Unit: parser/inline/math', () => {
|
|
|
31
31
|
assert.deepStrictEqual(inspect(parser('$a"$'), ctx), undefined);
|
|
32
32
|
assert.deepStrictEqual(inspect(parser('$-a($-b)'), ctx), undefined);
|
|
33
33
|
assert.deepStrictEqual(inspect(parser('$-a\\($-b\\)'), ctx), undefined);
|
|
34
|
-
assert.deepStrictEqual(inspect(parser('$a($'), ctx), undefined);
|
|
35
34
|
assert.deepStrictEqual(inspect(parser('$-a[$-b]'), ctx), undefined);
|
|
36
35
|
assert.deepStrictEqual(inspect(parser('$-a\\[$-b\\]'), ctx), undefined);
|
|
37
|
-
assert.deepStrictEqual(inspect(parser('$a[$'), ctx), undefined);
|
|
38
36
|
assert.deepStrictEqual(inspect(parser('$-a{$-b}'), ctx), undefined);
|
|
39
37
|
assert.deepStrictEqual(inspect(parser('$a{$'), ctx), undefined);
|
|
40
38
|
assert.deepStrictEqual(inspect(parser('$a$b'), ctx), undefined);
|
|
@@ -81,11 +79,13 @@ describe('Unit: parser/inline/math', () => {
|
|
|
81
79
|
assert.deepStrictEqual(inspect(parser('${\n}$'), ctx), undefined);
|
|
82
80
|
assert.deepStrictEqual(inspect(parser('${a\\$\nb}$'), ctx), undefined);
|
|
83
81
|
assert.deepStrictEqual(inspect(parser('${a\\$\\\nb}$'), ctx), undefined);
|
|
84
|
-
assert.deepStrictEqual(inspect(parser('$\\begin
|
|
82
|
+
assert.deepStrictEqual(inspect(parser('$\\begin$'), ctx), [['<span class="invalid" translate="no">$\\begin$</span>'], '']);
|
|
85
83
|
assert.deepStrictEqual(inspect(parser('$\\huge0$'), ctx), [['<span class="invalid" translate="no">$\\huge0$</span>'], '']);
|
|
86
|
-
assert.deepStrictEqual(inspect(parser('$\\Begin
|
|
84
|
+
assert.deepStrictEqual(inspect(parser('$\\Begin$'), ctx), [['<span class="invalid" translate="no">$\\Begin$</span>'], '']);
|
|
85
|
+
assert.deepStrictEqual(inspect(parser('$\\begin{}$'), ctx), [['<span class="invalid" translate="no">$\\begin{}$</span>'], '']);
|
|
87
86
|
assert.deepStrictEqual(inspect(parser('${\\begin}$'), ctx), [['<span class="invalid" translate="no">${\\begin}$</span>'], '']);
|
|
88
|
-
assert.deepStrictEqual(inspect(parser('$http://host$'), ctx),
|
|
87
|
+
assert.deepStrictEqual(inspect(parser('$http://host$'), ctx), [['<span class="invalid" translate="no">$http://host$</span>'], '']);
|
|
88
|
+
assert.deepStrictEqual(inspect(parser('${http://host}$'), ctx), [['<span class="invalid" translate="no">${http://host}$</span>'], '']);
|
|
89
89
|
assert.deepStrictEqual(inspect(parser(' ${a}$'), ctx), undefined);
|
|
90
90
|
});
|
|
91
91
|
|
|
@@ -123,7 +123,7 @@ describe('Unit: parser/inline/math', () => {
|
|
|
123
123
|
assert.deepStrictEqual(inspect(parser('$E = mc^2$'), ctx), [['<span class="math" translate="no" data-src="$E = mc^2$">$E = mc^2$</span>'], '']);
|
|
124
124
|
assert.deepStrictEqual(inspect(parser('$f(x)$'), ctx), [['<span class="math" translate="no" data-src="$f(x)$">$f(x)$</span>'], '']);
|
|
125
125
|
assert.deepStrictEqual(inspect(parser('$f: x \\to y$'), ctx), [['<span class="math" translate="no" data-src="$f: x \\to y$">$f: x \\to y$</span>'], '']);
|
|
126
|
-
assert.deepStrictEqual(inspect(parser('$k
|
|
126
|
+
assert.deepStrictEqual(inspect(parser('$k$\\-space'), ctx), [['<span class="math" translate="no" data-src="$k$">$k$</span>'], '\\-space']);
|
|
127
127
|
assert.deepStrictEqual(inspect(parser('$a{b}$'), ctx), [['<span class="math" translate="no" data-src="$a{b}$">$a{b}$</span>'], '']);
|
|
128
128
|
assert.deepStrictEqual(inspect(parser('$a\\{$\\}'), ctx), [['<span class="math" translate="no" data-src="$a\\{$">$a\\{$</span>'], '\\}']);
|
|
129
129
|
assert.deepStrictEqual(inspect(parser('${}$'), ctx), [['<span class="math" translate="no" data-src="${}$">${}$</span>'], '']);
|
|
@@ -1,30 +1,26 @@
|
|
|
1
1
|
import { MathParser } from '../inline';
|
|
2
2
|
import { Backtrack, Recursion } from '../context';
|
|
3
|
-
import { union, some, recursion, precedence, validate,
|
|
3
|
+
import { union, some, recursion, precedence, validate, rewrite, surround, lazy } from '../../combinator';
|
|
4
4
|
import { escsource, str } from '../source';
|
|
5
5
|
import { invalid } from '../util';
|
|
6
6
|
import { html } from 'typed-dom/dom';
|
|
7
7
|
|
|
8
|
-
const forbiddenCommand = /\\(?:begin|tiny|huge|large)(?![a-z])
|
|
8
|
+
const forbiddenCommand = /\\(?:begin|tiny|huge|large)(?![a-z])|:\/\//i;
|
|
9
9
|
|
|
10
10
|
export const math: MathParser = lazy(() => validate('$', rewrite(
|
|
11
11
|
union([
|
|
12
12
|
surround(
|
|
13
|
-
|
|
13
|
+
/\$(?={)/y,
|
|
14
14
|
precedence(5, bracket),
|
|
15
15
|
'$',
|
|
16
16
|
false, undefined, undefined, [3 | Backtrack.bracket]),
|
|
17
17
|
surround(
|
|
18
|
-
|
|
18
|
+
/\$(?![\s{}])/y,
|
|
19
19
|
precedence(2, some(union([
|
|
20
|
+
some(escsource, /\s?\$|[`"{}\n]/y),
|
|
20
21
|
precedence(5, bracket),
|
|
21
|
-
some(focus(
|
|
22
|
-
/^(?:[ ([](?!\$)|\\[\\{}$#]?|[!%&')\x2A-\x5A\]^_\x61-\x7A|~])/,
|
|
23
|
-
escsource,
|
|
24
|
-
false),
|
|
25
|
-
'://'),
|
|
26
22
|
]))),
|
|
27
|
-
|
|
23
|
+
/\$(?![-0-9A-Za-z])/y,
|
|
28
24
|
false, undefined, undefined, [3 | Backtrack.bracket]),
|
|
29
25
|
]),
|
|
30
26
|
({ context: { source, caches: { math: cache } = {} } }) => [[
|
|
@@ -46,7 +42,7 @@ const bracket: MathParser.BracketParser = lazy(() => surround(
|
|
|
46
42
|
recursion(Recursion.terminal,
|
|
47
43
|
some(union([
|
|
48
44
|
bracket,
|
|
49
|
-
some(escsource,
|
|
45
|
+
some(escsource, /[{}$\n]/y),
|
|
50
46
|
]))),
|
|
51
47
|
str('}'),
|
|
52
48
|
true));
|