securemark 0.299.3 → 0.300.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 +8 -0
- package/design.md +0 -6
- package/dist/index.js +3479 -2750
- package/index.d.ts +2 -1
- package/index.ts +2 -2
- package/markdown.d.ts +209 -183
- package/package.json +1 -1
- package/src/{parser/api → api}/bind.test.ts +2 -24
- package/src/{parser/api → api}/bind.ts +18 -13
- package/src/{parser/api → api}/body.test.ts +1 -1
- package/src/{parser/api → api}/cache.ts +1 -1
- package/src/{parser/api → api}/header.test.ts +1 -1
- package/src/{parser/api → api}/header.ts +9 -6
- package/src/{parser/api → api}/normalize.test.ts +1 -1
- package/src/{parser/api → api}/parse.test.ts +120 -124
- package/src/api/parse.ts +30 -0
- package/src/api/run.ts +6 -0
- package/src/{parser/api.ts → api.ts} +1 -0
- package/src/combinator/control/inits.ts +26 -0
- package/src/combinator/control/sequence.test.ts +38 -0
- package/src/combinator/control/sequence.ts +17 -0
- package/src/combinator/control/some.test.ts +41 -0
- package/src/combinator/{data/parser → control}/some.ts +39 -26
- package/src/combinator/control/state.ts +42 -0
- package/src/combinator/control/subsequence.test.ts +47 -0
- package/src/combinator/control/subsequence.ts +16 -0
- package/src/combinator/control/tails.ts +8 -0
- package/src/combinator/control/union.test.ts +37 -0
- package/src/combinator/control/union.ts +18 -0
- package/src/combinator/{data/delimiter.ts → delimiter.ts} +40 -60
- package/src/combinator/effect/backtrack.ts +64 -0
- package/src/combinator/effect/clock.ts +10 -0
- package/src/combinator/effect/precedence.ts +50 -0
- package/src/combinator/effect/recursion.ts +30 -0
- package/src/combinator/effect/scope.ts +100 -0
- package/src/combinator/effect/state.ts +72 -0
- package/src/combinator/{data/node.ts → parser/list.ts} +38 -13
- package/src/combinator/parser.ts +293 -0
- package/src/combinator/process/bind.ts +34 -0
- package/src/combinator/process/block.test.ts +20 -0
- package/src/combinator/process/block.ts +33 -0
- package/src/combinator/process/clear.ts +16 -0
- package/src/combinator/process/contract.ts +35 -0
- package/src/combinator/process/duplicate.ts +7 -0
- package/src/combinator/process/error.ts +13 -0
- package/src/combinator/{control/manipulation → process}/fallback.ts +3 -3
- package/src/combinator/process/fence.ts +59 -0
- package/src/combinator/process/fmap.ts +10 -0
- package/src/combinator/process/indent.test.ts +31 -0
- package/src/combinator/process/indent.ts +51 -0
- package/src/combinator/process/lazy.ts +8 -0
- package/src/combinator/process/line.test.ts +21 -0
- package/src/combinator/process/line.ts +55 -0
- package/src/combinator/process/match.ts +37 -0
- package/src/combinator/process/reverse.ts +7 -0
- package/src/combinator/process/scope.ts +102 -0
- package/src/combinator/process/surround.ts +271 -0
- package/src/combinator.ts +28 -24
- package/src/debug.test.ts +11 -8
- package/src/parser/autolink.test.ts +17 -18
- package/src/parser/block/blockquote.test.ts +78 -79
- package/src/parser/block/blockquote.ts +32 -25
- package/src/parser/block/codeblock.test.ts +56 -57
- package/src/parser/block/codeblock.ts +44 -26
- package/src/parser/block/dlist.test.ts +56 -57
- package/src/parser/block/dlist.ts +5 -5
- package/src/parser/block/extension/aside.test.ts +8 -9
- package/src/parser/block/extension/aside.ts +76 -47
- package/src/parser/block/extension/example.test.ts +18 -19
- package/src/parser/block/extension/example.ts +88 -48
- package/src/parser/block/extension/fig.test.ts +37 -36
- package/src/parser/block/extension/fig.ts +20 -25
- package/src/parser/block/extension/figbase.test.ts +18 -19
- package/src/parser/block/extension/figbase.ts +3 -3
- package/src/parser/block/extension/figure.test.ts +62 -63
- package/src/parser/block/extension/figure.ts +23 -21
- package/src/parser/block/extension/message.test.ts +13 -14
- package/src/parser/block/extension/message.ts +52 -39
- package/src/parser/block/extension/placeholder.test.ts +13 -13
- package/src/parser/block/extension/placeholder.ts +23 -21
- package/src/parser/block/extension/table.test.ts +70 -71
- package/src/parser/block/extension/table.ts +43 -31
- package/src/parser/block/extension.test.ts +24 -24
- package/src/parser/block/extension.ts +3 -3
- package/src/parser/block/heading.test.ts +58 -59
- package/src/parser/block/heading.ts +19 -18
- package/src/parser/block/ilist.test.ts +8 -8
- package/src/parser/block/ilist.ts +9 -7
- package/src/parser/block/mathblock.test.ts +31 -32
- package/src/parser/block/mathblock.ts +24 -23
- package/src/parser/block/mediablock.ts +7 -7
- package/src/parser/block/olist.test.ts +102 -103
- package/src/parser/block/olist.ts +11 -12
- package/src/parser/block/pagebreak.test.ts +15 -16
- package/src/parser/block/pagebreak.ts +5 -5
- package/src/parser/block/paragraph.test.ts +57 -58
- package/src/parser/block/paragraph.ts +1 -1
- package/src/parser/block/reply/cite.test.ts +39 -40
- package/src/parser/block/reply/cite.ts +5 -5
- package/src/parser/block/reply/quote.test.ts +50 -51
- package/src/parser/block/reply/quote.ts +8 -7
- package/src/parser/block/reply.test.ts +19 -20
- package/src/parser/block/reply.ts +2 -2
- package/src/parser/block/sidefence.test.ts +41 -48
- package/src/parser/block/sidefence.ts +17 -11
- package/src/parser/block/table.test.ts +48 -49
- package/src/parser/block/table.ts +10 -9
- package/src/parser/block/ulist.test.ts +52 -53
- package/src/parser/block/ulist.ts +9 -8
- package/src/parser/block.ts +63 -51
- package/src/parser/context.ts +35 -32
- package/src/parser/document.ts +48 -0
- package/src/parser/header.test.ts +19 -20
- package/src/parser/header.ts +31 -25
- package/src/parser/inline/annotation.test.ts +49 -50
- package/src/parser/inline/annotation.ts +14 -16
- package/src/parser/inline/autolink/account.test.ts +32 -33
- package/src/parser/inline/autolink/account.ts +18 -19
- package/src/parser/inline/autolink/anchor.test.ts +21 -22
- package/src/parser/inline/autolink/anchor.ts +7 -8
- package/src/parser/inline/autolink/channel.test.ts +14 -15
- package/src/parser/inline/autolink/email.test.ts +36 -37
- package/src/parser/inline/autolink/email.ts +6 -6
- package/src/parser/inline/autolink/hashnum.test.ts +32 -33
- package/src/parser/inline/autolink/hashnum.ts +7 -8
- package/src/parser/inline/autolink/hashtag.test.ts +59 -60
- package/src/parser/inline/autolink/hashtag.ts +8 -9
- package/src/parser/inline/autolink/url.test.ts +75 -76
- package/src/parser/inline/autolink/url.ts +13 -14
- package/src/parser/inline/autolink.ts +24 -11
- package/src/parser/inline/bracket.test.ts +73 -74
- package/src/parser/inline/bracket.ts +88 -63
- package/src/parser/inline/code.test.ts +30 -31
- package/src/parser/inline/code.ts +6 -6
- package/src/parser/inline/deletion.test.ts +27 -28
- package/src/parser/inline/deletion.ts +5 -5
- package/src/parser/inline/emphasis.test.ts +39 -40
- package/src/parser/inline/emphasis.ts +5 -5
- package/src/parser/inline/emstrong.test.ts +101 -102
- package/src/parser/inline/emstrong.ts +103 -85
- package/src/parser/inline/extension/index.test.ts +91 -92
- package/src/parser/inline/extension/index.ts +17 -13
- package/src/parser/inline/extension/indexee.ts +4 -4
- package/src/parser/inline/extension/indexer.test.ts +23 -24
- package/src/parser/inline/extension/indexer.ts +6 -5
- package/src/parser/inline/extension/label.test.ts +32 -33
- package/src/parser/inline/extension/label.ts +14 -5
- package/src/parser/inline/extension/placeholder.test.ts +42 -43
- package/src/parser/inline/extension/placeholder.ts +8 -9
- package/src/parser/inline/html.test.ts +109 -109
- package/src/parser/inline/html.ts +27 -27
- package/src/parser/inline/htmlentity.test.ts +37 -38
- package/src/parser/inline/htmlentity.ts +6 -7
- package/src/parser/inline/insertion.test.ts +27 -28
- package/src/parser/inline/insertion.ts +5 -5
- package/src/parser/inline/italic.test.ts +55 -56
- package/src/parser/inline/italic.ts +5 -5
- package/src/parser/inline/link.test.ts +186 -187
- package/src/parser/inline/link.ts +31 -32
- package/src/parser/inline/mark.test.ts +31 -32
- package/src/parser/inline/mark.ts +6 -6
- package/src/parser/inline/math.test.ts +140 -141
- package/src/parser/inline/math.ts +6 -7
- package/src/parser/inline/media.test.ts +92 -93
- package/src/parser/inline/media.ts +32 -38
- package/src/parser/inline/reference.test.ts +111 -112
- package/src/parser/inline/reference.ts +61 -32
- package/src/parser/inline/remark.test.ts +49 -50
- package/src/parser/inline/remark.ts +13 -13
- package/src/parser/inline/ruby.test.ts +49 -50
- package/src/parser/inline/ruby.ts +60 -49
- package/src/parser/inline/shortmedia.test.ts +9 -10
- package/src/parser/inline/shortmedia.ts +11 -9
- package/src/parser/inline/strong.test.ts +36 -37
- package/src/parser/inline/strong.ts +5 -5
- package/src/parser/inline/template.test.ts +22 -23
- package/src/parser/inline/template.ts +13 -16
- package/src/parser/inline.test.ts +225 -226
- package/src/parser/inline.ts +68 -34
- package/src/parser/node.ts +1 -1
- package/src/parser/parser.ts +51 -0
- package/src/parser/repeat.ts +118 -91
- package/src/parser/segment.test.ts +0 -11
- package/src/parser/segment.ts +25 -28
- package/src/parser/source/escapable.test.ts +23 -24
- package/src/parser/source/escapable.ts +20 -20
- package/src/parser/source/line.test.ts +17 -18
- package/src/parser/source/line.ts +19 -24
- package/src/parser/source/str.ts +17 -10
- package/src/parser/source/text.test.ts +88 -89
- package/src/parser/source/text.ts +19 -20
- package/src/parser/source/unescapable.test.ts +23 -24
- package/src/parser/source/unescapable.ts +16 -16
- package/src/parser/util.ts +1 -1
- package/src/parser/visibility.ts +36 -15
- package/src/{parser/processor → processor}/figure.test.ts +23 -23
- package/src/{parser/processor → processor}/figure.ts +20 -12
- package/src/{parser/processor → processor}/note.test.ts +15 -15
- package/src/{parser/processor → processor}/note.ts +6 -4
- package/src/renderer/render/media/pdf.ts +2 -2
- package/src/renderer/render/media/twitter.ts +2 -2
- package/src/renderer/render/media.test.ts +12 -13
- package/src/renderer/render.test.ts +11 -11
- package/src/util/info.test.ts +2 -2
- package/src/util/quote.test.ts +3 -3
- package/src/util/quote.ts +6 -5
- package/src/util/toc.test.ts +12 -12
- package/src/combinator/control/constraint/block.test.ts +0 -20
- package/src/combinator/control/constraint/block.ts +0 -28
- package/src/combinator/control/constraint/contract.ts +0 -27
- package/src/combinator/control/constraint/line.test.ts +0 -21
- package/src/combinator/control/constraint/line.ts +0 -42
- package/src/combinator/control/manipulation/clear.ts +0 -5
- package/src/combinator/control/manipulation/convert.ts +0 -22
- package/src/combinator/control/manipulation/duplicate.ts +0 -7
- package/src/combinator/control/manipulation/fence.ts +0 -54
- package/src/combinator/control/manipulation/indent.test.ts +0 -31
- package/src/combinator/control/manipulation/indent.ts +0 -39
- package/src/combinator/control/manipulation/lazy.ts +0 -8
- package/src/combinator/control/manipulation/match.ts +0 -27
- package/src/combinator/control/manipulation/recovery.ts +0 -18
- package/src/combinator/control/manipulation/reverse.ts +0 -8
- package/src/combinator/control/manipulation/scope.ts +0 -61
- package/src/combinator/control/manipulation/surround.ts +0 -223
- package/src/combinator/control/monad/bind.ts +0 -26
- package/src/combinator/control/monad/fmap.ts +0 -10
- package/src/combinator/data/parser/context.ts +0 -96
- package/src/combinator/data/parser/inits.ts +0 -20
- package/src/combinator/data/parser/sequence.test.ts +0 -33
- package/src/combinator/data/parser/sequence.ts +0 -20
- package/src/combinator/data/parser/some.test.ts +0 -37
- package/src/combinator/data/parser/subsequence.test.ts +0 -41
- package/src/combinator/data/parser/subsequence.ts +0 -13
- package/src/combinator/data/parser/tails.ts +0 -8
- package/src/combinator/data/parser/union.test.ts +0 -33
- package/src/combinator/data/parser/union.ts +0 -18
- package/src/combinator/data/parser.ts +0 -144
- package/src/parser/api/parse.ts +0 -48
- package/src/parser.ts +0 -1
- /package/src/{parser/api → api}/body.ts +0 -0
- /package/src/{parser/api → api}/normalize.ts +0 -0
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { htmlentity } from './htmlentity';
|
|
2
2
|
import { some } from '../../combinator';
|
|
3
|
-
import { input } from '
|
|
4
|
-
import { Context } from '../context';
|
|
3
|
+
import { input } from '../context';
|
|
5
4
|
import { inspect } from '../../debug.test';
|
|
6
5
|
|
|
7
6
|
describe('Unit: parser/inline/htmlentity', () => {
|
|
@@ -9,45 +8,45 @@ describe('Unit: parser/inline/htmlentity', () => {
|
|
|
9
8
|
const parser = some(htmlentity);
|
|
10
9
|
|
|
11
10
|
it('invalid', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser, input(''
|
|
13
|
-
assert.deepStrictEqual(inspect(parser, input('&'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser, input('&'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser, input('&;'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser, input('& ;'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser, input('&\n;'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser, input('&a;'
|
|
19
|
-
assert.deepStrictEqual(inspect(parser, input('&#;'
|
|
20
|
-
assert.deepStrictEqual(inspect(parser, input('&#g;'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser, input('&#x;'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser, input('&#-1;'
|
|
23
|
-
assert.deepStrictEqual(inspect(parser, input('&&;'
|
|
24
|
-
assert.deepStrictEqual(inspect(parser, input('&*&*'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser, input('&<;'
|
|
26
|
-
assert.deepStrictEqual(inspect(parser, input('&<>;'
|
|
27
|
-
assert.deepStrictEqual(inspect(parser, input('&>;'
|
|
28
|
-
assert.deepStrictEqual(inspect(parser, input('#'
|
|
29
|
-
assert.deepStrictEqual(inspect(parser, input('Ӓ'
|
|
30
|
-
assert.deepStrictEqual(inspect(parser, input('Ϡ'
|
|
31
|
-
assert.deepStrictEqual(inspect(parser, input('�'
|
|
32
|
-
assert.deepStrictEqual(inspect(parser, input('�'
|
|
33
|
-
assert.deepStrictEqual(inspect(parser, input('"'
|
|
34
|
-
assert.deepStrictEqual(inspect(parser, input('ആ'
|
|
35
|
-
assert.deepStrictEqual(inspect(parser, input('ಫ'
|
|
36
|
-
assert.deepStrictEqual(inspect(parser, input('
'
|
|
37
|
-
assert.deepStrictEqual(inspect(parser, input(' &'
|
|
11
|
+
assert.deepStrictEqual(inspect(parser, input('')), undefined);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('&')), [['&'], '']);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('&')), [['&'], '']);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('&;')), [['&'], ';']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('& ;')), [['&'], ' ;']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('&\n;')), [['&'], '\n;']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('&a;')), [['<span class="invalid">&a;</span>'], '']);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input('&#;')), [['&'], '#;']);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('&#g;')), [['&'], '#g;']);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser, input('&#x;')), [['&'], '#x;']);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('&#-1;')), [['&'], '#-1;']);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('&&;')), [['&', '&'], ';']);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('&*&*')), [['&'], '*&*']);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('&<;')), [['&'], '<;']);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('&<>;')), [['&'], '<>;']);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input('&>;')), [['&'], '>;']);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser, input('#')), [['&'], '#35;']);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser, input('Ӓ')), [['&'], '#1234;']);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser, input('Ϡ')), [['&'], '#992;']);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser, input('�')), [['&'], '#98765432;']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser, input('�')), [['&'], '#0;']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser, input('"')), [['&'], '#X22;']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser, input('ആ')), [['&'], '#XD06;']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('ಫ')), [['&'], '#xcab;']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('
')), [['<span class="invalid">&NewLine;</span>'], '']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser, input(' &')), undefined);
|
|
38
37
|
});
|
|
39
38
|
|
|
40
39
|
it('entity', () => {
|
|
41
|
-
assert.deepStrictEqual(inspect(parser, input(' '
|
|
42
|
-
assert.deepStrictEqual(inspect(parser, input('&'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser, input('©'
|
|
44
|
-
assert.deepStrictEqual(inspect(parser, input('Æ'
|
|
45
|
-
assert.deepStrictEqual(inspect(parser, input('Ď'
|
|
46
|
-
assert.deepStrictEqual(inspect(parser, input('¾'
|
|
47
|
-
assert.deepStrictEqual(inspect(parser, input('ℋ'
|
|
48
|
-
assert.deepStrictEqual(inspect(parser, input('ⅆ'
|
|
49
|
-
assert.deepStrictEqual(inspect(parser, input('∲'
|
|
50
|
-
assert.deepStrictEqual(inspect(parser, input('≧̸'
|
|
40
|
+
assert.deepStrictEqual(inspect(parser, input(' ')), [['\u00A0'], '']);
|
|
41
|
+
assert.deepStrictEqual(inspect(parser, input('&')), [['&'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('©')), [['©'], '']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser, input('Æ')), [['Æ'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser, input('Ď')), [['Ď'], '']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser, input('¾')), [['¾'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser, input('ℋ')), [['ℋ'], '']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser, input('ⅆ')), [['ⅆ'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser, input('∲')), [['∲'], '']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser, input('≧̸')), [['≧̸'], '']);
|
|
51
50
|
});
|
|
52
51
|
|
|
53
52
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { HTMLEntityParser, UnsafeHTMLEntityParser } from '../inline';
|
|
2
2
|
import { Backtrack } from '../context';
|
|
3
|
-
import { List, Node } from '../../combinator/data/parser';
|
|
4
3
|
import { Flag, isBlankHTMLEntityName } from '../node';
|
|
4
|
+
import { List, Node } from '../../combinator/parser';
|
|
5
5
|
import { union, surround, fmap } from '../../combinator';
|
|
6
6
|
import { str } from '../source';
|
|
7
7
|
import { invalid } from '../util';
|
|
@@ -11,14 +11,13 @@ export const unsafehtmlentity: UnsafeHTMLEntityParser = surround(
|
|
|
11
11
|
str('&'), str(/[0-9A-Za-z]+/y), str(';'),
|
|
12
12
|
false,
|
|
13
13
|
[3 | Backtrack.unescapable],
|
|
14
|
-
([as, bs, cs]) =>
|
|
15
|
-
|
|
14
|
+
([as, bs, cs], _, output) =>
|
|
15
|
+
output.append(
|
|
16
16
|
new Node(
|
|
17
17
|
parser(as.head!.value + bs.head!.value + cs.head!.value),
|
|
18
|
-
isBlankHTMLEntityName(bs.head!.value) ? Flag.blank : Flag.none)
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
new List([new Node(as.head!.value + (bs?.head?.value ?? ''))]));
|
|
18
|
+
isBlankHTMLEntityName(bs.head!.value) ? Flag.blank : Flag.none)),
|
|
19
|
+
([as, bs], _, output) =>
|
|
20
|
+
output.append(new Node(as.head!.value + (bs?.head?.value ?? ''))));
|
|
22
21
|
|
|
23
22
|
export const htmlentity: HTMLEntityParser = fmap(
|
|
24
23
|
union([unsafehtmlentity]),
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { insertion } from './insertion';
|
|
2
2
|
import { some } from '../../combinator';
|
|
3
|
-
import { input } from '
|
|
4
|
-
import { Context } from '../context';
|
|
3
|
+
import { input } from '../context';
|
|
5
4
|
import { inspect } from '../../debug.test';
|
|
6
5
|
|
|
7
6
|
describe('Unit: parser/inline/insertion', () => {
|
|
@@ -9,38 +8,38 @@ describe('Unit: parser/inline/insertion', () => {
|
|
|
9
8
|
const parser = some(insertion);
|
|
10
9
|
|
|
11
10
|
it('invalid', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser, input(''
|
|
13
|
-
assert.deepStrictEqual(inspect(parser, input('+'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser, input('++'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser, input('++a'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser, input('++a+'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser, input(' ++a++'
|
|
11
|
+
assert.deepStrictEqual(inspect(parser, input('')), undefined);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('+')), undefined);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('++')), [['++'], '']);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('++a')), [['++', 'a'], '']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('++a+')), [['++', 'a+'], '']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input(' ++a++')), undefined);
|
|
18
17
|
});
|
|
19
18
|
|
|
20
19
|
it('basic', () => {
|
|
21
|
-
assert.deepStrictEqual(inspect(parser, input('++a++'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser, input('++a+b++'
|
|
23
|
-
assert.deepStrictEqual(inspect(parser, input('++ ++'
|
|
24
|
-
assert.deepStrictEqual(inspect(parser, input('++ a++'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser, input('++ a ++'
|
|
26
|
-
assert.deepStrictEqual(inspect(parser, input('++ a ++'
|
|
27
|
-
assert.deepStrictEqual(inspect(parser, input('++\na++'
|
|
28
|
-
assert.deepStrictEqual(inspect(parser, input('++\\\na++'
|
|
29
|
-
assert.deepStrictEqual(inspect(parser, input('++<wbr>a++'
|
|
30
|
-
assert.deepStrictEqual(inspect(parser, input('++a ++'
|
|
31
|
-
assert.deepStrictEqual(inspect(parser, input('++a \n ++'
|
|
32
|
-
assert.deepStrictEqual(inspect(parser, input('++a\n++'
|
|
33
|
-
assert.deepStrictEqual(inspect(parser, input('++a\n ++'
|
|
34
|
-
assert.deepStrictEqual(inspect(parser, input('++a\n<wbr>++'
|
|
35
|
-
assert.deepStrictEqual(inspect(parser, input('++a\nb++'
|
|
36
|
-
assert.deepStrictEqual(inspect(parser, input('++a\\\nb++'
|
|
37
|
-
assert.deepStrictEqual(inspect(parser, input('++\\+++'
|
|
38
|
-
assert.deepStrictEqual(inspect(parser, input('++a+++'
|
|
20
|
+
assert.deepStrictEqual(inspect(parser, input('++a++')), [['<ins>a</ins>'], '']);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('++a+b++')), [['<ins>a+b</ins>'], '']);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('++ ++')), [['<ins> </ins>'], '']);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('++ a++')), [['<ins> a</ins>'], '']);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('++ a ++')), [['<ins> a </ins>'], '']);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('++ a ++')), [['<ins> a </ins>'], '']);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input('++\na++')), [['<ins><br>a</ins>'], '']);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser, input('++\\\na++')), [['<ins><br>a</ins>'], '']);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser, input('++<wbr>a++')), [['<ins><wbr>a</ins>'], '']);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser, input('++a ++')), [['<ins>a </ins>'], '']);
|
|
30
|
+
assert.deepStrictEqual(inspect(parser, input('++a \n ++')), [['<ins>a </ins>'], '']);
|
|
31
|
+
assert.deepStrictEqual(inspect(parser, input('++a\n++')), [['<ins>a</ins>'], '']);
|
|
32
|
+
assert.deepStrictEqual(inspect(parser, input('++a\n ++')), [['<ins>a </ins>'], '']);
|
|
33
|
+
assert.deepStrictEqual(inspect(parser, input('++a\n<wbr>++')), [['<ins>a<wbr></ins>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('++a\nb++')), [['<ins>a<br>b</ins>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('++a\\\nb++')), [['<ins>a<br>b</ins>'], '']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser, input('++\\+++')), [['<ins>+</ins>'], '']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser, input('++a+++')), [['<ins>a</ins>'], '+']);
|
|
39
38
|
});
|
|
40
39
|
|
|
41
40
|
it('nest', () => {
|
|
42
|
-
assert.deepStrictEqual(inspect(parser, input('++*++a++*++'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser, input('++*~~a~~*++'
|
|
41
|
+
assert.deepStrictEqual(inspect(parser, input('++*++a++*++')), [['<ins><em><ins>a</ins></em></ins>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('++*~~a~~*++')), [['<ins><em><del>a</del></em></ins>'], '']);
|
|
44
43
|
});
|
|
45
44
|
|
|
46
45
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { InsertionParser } from '../inline';
|
|
2
2
|
import { Recursion, Command } from '../context';
|
|
3
|
-
import { List, Node } from '../../combinator/
|
|
4
|
-
import { union, some, precedence, surround, open, lazy } from '../../combinator';
|
|
3
|
+
import { List, Node } from '../../combinator/parser';
|
|
4
|
+
import { union, some, precedence, backtrack, surround, open, lazy } from '../../combinator';
|
|
5
5
|
import { inline } from '../inline';
|
|
6
6
|
import { repeat } from '../repeat';
|
|
7
7
|
import { blankWith } from '../visibility';
|
|
@@ -9,7 +9,7 @@ import { unwrap } from '../util';
|
|
|
9
9
|
import { html, defrag } from 'typed-dom/dom';
|
|
10
10
|
|
|
11
11
|
export const insertion: InsertionParser = lazy(() =>
|
|
12
|
-
repeat('++', '', '++', Recursion.inline, precedence(0, surround(
|
|
12
|
+
repeat('++', '', '++', Recursion.inline, precedence(0, backtrack(surround(
|
|
13
13
|
'',
|
|
14
14
|
some(union([
|
|
15
15
|
some(inline, blankWith('\n', '++')),
|
|
@@ -17,6 +17,6 @@ export const insertion: InsertionParser = lazy(() =>
|
|
|
17
17
|
])),
|
|
18
18
|
'++',
|
|
19
19
|
false, [],
|
|
20
|
-
([, bs],
|
|
21
|
-
([, bs],
|
|
20
|
+
([, bs], _, output) => output.import(bs),
|
|
21
|
+
([, bs], _, output) => bs && output.import(bs.push(new Node(Command.Cancel)))))),
|
|
22
22
|
nodes => new List([new Node(html('ins', defrag(unwrap(nodes))))])));
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { italic } from './italic';
|
|
2
2
|
import { some } from '../../combinator';
|
|
3
|
-
import { input } from '
|
|
4
|
-
import { Context } from '../context';
|
|
3
|
+
import { input } from '../context';
|
|
5
4
|
import { inspect } from '../../debug.test';
|
|
6
5
|
|
|
7
6
|
describe('Unit: parser/inline/italic', () => {
|
|
@@ -9,66 +8,66 @@ describe('Unit: parser/inline/italic', () => {
|
|
|
9
8
|
const parser = some(italic);
|
|
10
9
|
|
|
11
10
|
it('invalid', () => {
|
|
12
|
-
assert.deepStrictEqual(inspect(parser, input('///'
|
|
13
|
-
assert.deepStrictEqual(inspect(parser, input('///a'
|
|
14
|
-
assert.deepStrictEqual(inspect(parser, input('///a ///'
|
|
15
|
-
assert.deepStrictEqual(inspect(parser, input('///a ///'
|
|
16
|
-
assert.deepStrictEqual(inspect(parser, input('///a\n///'
|
|
17
|
-
assert.deepStrictEqual(inspect(parser, input('///a\\ ///'
|
|
18
|
-
assert.deepStrictEqual(inspect(parser, input('///a\\\n///'
|
|
19
|
-
assert.deepStrictEqual(inspect(parser, input('///a/b'
|
|
20
|
-
assert.deepStrictEqual(inspect(parser, input('///a//b'
|
|
21
|
-
assert.deepStrictEqual(inspect(parser, input('///a*b///'
|
|
22
|
-
assert.deepStrictEqual(inspect(parser, input('/// ///'
|
|
23
|
-
assert.deepStrictEqual(inspect(parser, input('/// a///'
|
|
24
|
-
assert.deepStrictEqual(inspect(parser, input('/// a ///'
|
|
25
|
-
assert.deepStrictEqual(inspect(parser, input('///\n///'
|
|
26
|
-
assert.deepStrictEqual(inspect(parser, input('///\na///'
|
|
27
|
-
assert.deepStrictEqual(inspect(parser, input('///\\ a///'
|
|
28
|
-
assert.deepStrictEqual(inspect(parser, input('///\\\na///'
|
|
29
|
-
assert.deepStrictEqual(inspect(parser, input('///<wbr>a///'
|
|
30
|
-
assert.deepStrictEqual(inspect(parser, input(' ///a///'
|
|
11
|
+
assert.deepStrictEqual(inspect(parser, input('///')), [['///'], '']);
|
|
12
|
+
assert.deepStrictEqual(inspect(parser, input('///a')), [['///', 'a'], '']);
|
|
13
|
+
assert.deepStrictEqual(inspect(parser, input('///a ///')), [['///', 'a ', '///'], '']);
|
|
14
|
+
assert.deepStrictEqual(inspect(parser, input('///a ///')), [['///', 'a', ' ', '///'], '']);
|
|
15
|
+
assert.deepStrictEqual(inspect(parser, input('///a\n///')), [['///', 'a', '<br>', '///'], '']);
|
|
16
|
+
assert.deepStrictEqual(inspect(parser, input('///a\\ ///')), [['///', 'a', ' ', '///'], '']);
|
|
17
|
+
assert.deepStrictEqual(inspect(parser, input('///a\\\n///')), [['///', 'a', '<br>', '///'], '']);
|
|
18
|
+
assert.deepStrictEqual(inspect(parser, input('///a/b')), [['///', 'a/b'], '']);
|
|
19
|
+
assert.deepStrictEqual(inspect(parser, input('///a//b')), [['///', 'a//b'], '']);
|
|
20
|
+
assert.deepStrictEqual(inspect(parser, input('///a*b///')), [['///', 'a', '*', 'b', '///'], '']);
|
|
21
|
+
assert.deepStrictEqual(inspect(parser, input('/// ///')), undefined);
|
|
22
|
+
assert.deepStrictEqual(inspect(parser, input('/// a///')), undefined);
|
|
23
|
+
assert.deepStrictEqual(inspect(parser, input('/// a ///')), undefined);
|
|
24
|
+
assert.deepStrictEqual(inspect(parser, input('///\n///')), undefined);
|
|
25
|
+
assert.deepStrictEqual(inspect(parser, input('///\na///')), undefined);
|
|
26
|
+
assert.deepStrictEqual(inspect(parser, input('///\\ a///')), undefined);
|
|
27
|
+
assert.deepStrictEqual(inspect(parser, input('///\\\na///')), undefined);
|
|
28
|
+
assert.deepStrictEqual(inspect(parser, input('///<wbr>a///')), undefined);
|
|
29
|
+
assert.deepStrictEqual(inspect(parser, input(' ///a///')), undefined);
|
|
31
30
|
});
|
|
32
31
|
|
|
33
32
|
it('basic', () => {
|
|
34
|
-
assert.deepStrictEqual(inspect(parser, input('///a///'
|
|
35
|
-
assert.deepStrictEqual(inspect(parser, input('///ab///'
|
|
36
|
-
assert.deepStrictEqual(inspect(parser, input('///a////'
|
|
37
|
-
assert.deepStrictEqual(inspect(parser, input('///a\nb///'
|
|
38
|
-
assert.deepStrictEqual(inspect(parser, input('///a\\\nb///'
|
|
33
|
+
assert.deepStrictEqual(inspect(parser, input('///a///')), [['<i>a</i>'], '']);
|
|
34
|
+
assert.deepStrictEqual(inspect(parser, input('///ab///')), [['<i>ab</i>'], '']);
|
|
35
|
+
assert.deepStrictEqual(inspect(parser, input('///a////')), [['<i>a</i>'], '/']);
|
|
36
|
+
assert.deepStrictEqual(inspect(parser, input('///a\nb///')), [['<i>a<br>b</i>'], '']);
|
|
37
|
+
assert.deepStrictEqual(inspect(parser, input('///a\\\nb///')), [['<i>a<br>b</i>'], '']);
|
|
39
38
|
});
|
|
40
39
|
|
|
41
40
|
it('nest', () => {
|
|
42
|
-
assert.deepStrictEqual(inspect(parser, input('////a///'
|
|
43
|
-
assert.deepStrictEqual(inspect(parser, input('////a///b'
|
|
44
|
-
assert.deepStrictEqual(inspect(parser, input('////a////'
|
|
45
|
-
assert.deepStrictEqual(inspect(parser, input('////a////b'
|
|
46
|
-
assert.deepStrictEqual(inspect(parser, input('/////a///'
|
|
47
|
-
assert.deepStrictEqual(inspect(parser, input('/////a///b'
|
|
48
|
-
assert.deepStrictEqual(inspect(parser, input('/////a////'
|
|
49
|
-
assert.deepStrictEqual(inspect(parser, input('/////a////b'
|
|
50
|
-
assert.deepStrictEqual(inspect(parser, input('/////a/////'
|
|
51
|
-
assert.deepStrictEqual(inspect(parser, input('/////a/////b'
|
|
52
|
-
assert.deepStrictEqual(inspect(parser, input('//////a///'
|
|
53
|
-
assert.deepStrictEqual(inspect(parser, input('//////a///b'
|
|
54
|
-
assert.deepStrictEqual(inspect(parser, input('//////a////'
|
|
55
|
-
assert.deepStrictEqual(inspect(parser, input('//////a////b'
|
|
56
|
-
assert.deepStrictEqual(inspect(parser, input('//////a/////'
|
|
57
|
-
assert.deepStrictEqual(inspect(parser, input('//////a/////b'
|
|
58
|
-
assert.deepStrictEqual(inspect(parser, input('//////a//////'
|
|
59
|
-
assert.deepStrictEqual(inspect(parser, input('//////a///b///'
|
|
60
|
-
assert.deepStrictEqual(inspect(parser, input('//////a/// b///'
|
|
61
|
-
assert.deepStrictEqual(inspect(parser, input('///a ///b//////'
|
|
62
|
-
assert.deepStrictEqual(inspect(parser, input('///- ///b//////'
|
|
63
|
-
assert.deepStrictEqual(inspect(parser, input('///a\\ ///b//////'
|
|
64
|
-
assert.deepStrictEqual(inspect(parser, input('///a //////b/////////'
|
|
65
|
-
assert.deepStrictEqual(inspect(parser, input('///a ///b///c///'
|
|
66
|
-
assert.deepStrictEqual(inspect(parser, input('///a ///b ///c/////////'
|
|
67
|
-
assert.deepStrictEqual(inspect(parser, input('///a	///b//////'
|
|
68
|
-
assert.deepStrictEqual(inspect(parser, input('///a<wbr>///b//////'
|
|
69
|
-
assert.deepStrictEqual(inspect(parser, input('///`a`///'
|
|
70
|
-
assert.deepStrictEqual(inspect(parser, input('///(///a///)///'
|
|
71
|
-
assert.deepStrictEqual(inspect(parser, input('///{http://host/}///'
|
|
41
|
+
assert.deepStrictEqual(inspect(parser, input('////a///')), [['/', '<i>a</i>'], '']);
|
|
42
|
+
assert.deepStrictEqual(inspect(parser, input('////a///b')), [['/', '<i>a</i>'], 'b']);
|
|
43
|
+
assert.deepStrictEqual(inspect(parser, input('////a////')), [['/', '<i>a</i>', '/'], '']);
|
|
44
|
+
assert.deepStrictEqual(inspect(parser, input('////a////b')), [['/', '<i>a</i>', '/'], 'b']);
|
|
45
|
+
assert.deepStrictEqual(inspect(parser, input('/////a///')), [['//', '<i>a</i>'], '']);
|
|
46
|
+
assert.deepStrictEqual(inspect(parser, input('/////a///b')), [['//', '<i>a</i>'], 'b']);
|
|
47
|
+
assert.deepStrictEqual(inspect(parser, input('/////a////')), [['//', '<i>a</i>', '/'], '']);
|
|
48
|
+
assert.deepStrictEqual(inspect(parser, input('/////a////b')), [['//', '<i>a</i>', '/'], 'b']);
|
|
49
|
+
assert.deepStrictEqual(inspect(parser, input('/////a/////')), [['//', '<i>a</i>', '//'], '']);
|
|
50
|
+
assert.deepStrictEqual(inspect(parser, input('/////a/////b')), [['//', '<i>a</i>', '//'], 'b']);
|
|
51
|
+
assert.deepStrictEqual(inspect(parser, input('//////a///')), [['///', '<i>a</i>'], '']);
|
|
52
|
+
assert.deepStrictEqual(inspect(parser, input('//////a///b')), [['///', '<i>a</i>', 'b'], '']);
|
|
53
|
+
assert.deepStrictEqual(inspect(parser, input('//////a////')), [['///', '<i>a</i>', '/'], '']);
|
|
54
|
+
assert.deepStrictEqual(inspect(parser, input('//////a////b')), [['///', '<i>a</i>', '/b'], '']);
|
|
55
|
+
assert.deepStrictEqual(inspect(parser, input('//////a/////')), [['///', '<i>a</i>', '//'], '']);
|
|
56
|
+
assert.deepStrictEqual(inspect(parser, input('//////a/////b')), [['///', '<i>a</i>', '//b'], '']);
|
|
57
|
+
assert.deepStrictEqual(inspect(parser, input('//////a//////')), [['<i><i>a</i></i>'], '']);
|
|
58
|
+
assert.deepStrictEqual(inspect(parser, input('//////a///b///')), [['<i><i>a</i>b</i>'], '']);
|
|
59
|
+
assert.deepStrictEqual(inspect(parser, input('//////a/// b///')), [['<i><i>a</i> b</i>'], '']);
|
|
60
|
+
assert.deepStrictEqual(inspect(parser, input('///a ///b//////')), [['<i>a <i>b</i></i>'], '']);
|
|
61
|
+
assert.deepStrictEqual(inspect(parser, input('///- ///b//////')), [['<i>- <i>b</i></i>'], '']);
|
|
62
|
+
assert.deepStrictEqual(inspect(parser, input('///a\\ ///b//////')), [['<i>a <i>b</i></i>'], '']);
|
|
63
|
+
assert.deepStrictEqual(inspect(parser, input('///a //////b/////////')), [['<i>a <i><i>b</i></i></i>'], '']);
|
|
64
|
+
assert.deepStrictEqual(inspect(parser, input('///a ///b///c///')), [['<i>a <i>b</i>c</i>'], '']);
|
|
65
|
+
assert.deepStrictEqual(inspect(parser, input('///a ///b ///c/////////')), [['<i>a <i>b <i>c</i></i></i>'], '']);
|
|
66
|
+
assert.deepStrictEqual(inspect(parser, input('///a	///b//////')), [['<i>a\t<i>b</i></i>'], '']);
|
|
67
|
+
assert.deepStrictEqual(inspect(parser, input('///a<wbr>///b//////')), [['<i>a<wbr><i>b</i></i>'], '']);
|
|
68
|
+
assert.deepStrictEqual(inspect(parser, input('///`a`///')), [['<i><code data-src="`a`">a</code></i>'], '']);
|
|
69
|
+
assert.deepStrictEqual(inspect(parser, input('///(///a///)///')), [['<i><span class="paren">(<i>a</i>)</span></i>'], '']);
|
|
70
|
+
assert.deepStrictEqual(inspect(parser, input('///{http://host/}///')), [['<i><a class="url" href="http://host/" target="_blank">http://host/</a></i>'], '']);
|
|
72
71
|
});
|
|
73
72
|
|
|
74
73
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ItalicParser } from '../inline';
|
|
2
2
|
import { Recursion, Command } from '../context';
|
|
3
|
-
import { List, Node } from '../../combinator/
|
|
4
|
-
import { union, some, precedence, surround, lazy } from '../../combinator';
|
|
3
|
+
import { List, Node } from '../../combinator/parser';
|
|
4
|
+
import { union, some, precedence, backtrack, surround, lazy } from '../../combinator';
|
|
5
5
|
import { inline } from '../inline';
|
|
6
6
|
import { repeat } from '../repeat';
|
|
7
7
|
import { beforeNonblank, afterNonblank } from '../visibility';
|
|
@@ -12,11 +12,11 @@ import { html, defrag } from 'typed-dom/dom';
|
|
|
12
12
|
// 斜体は単語に使うとかえって見づらく読み飛ばしやすくなるため使わないべきであり
|
|
13
13
|
// ある程度の長さのある文に使うのが望ましい。
|
|
14
14
|
export const italic: ItalicParser = lazy(() =>
|
|
15
|
-
repeat('///', beforeNonblank, '///', Recursion.inline, precedence(0, surround(
|
|
15
|
+
repeat('///', beforeNonblank, '///', Recursion.inline, precedence(0, backtrack(surround(
|
|
16
16
|
'',
|
|
17
17
|
some(union([inline]), '///', afterNonblank),
|
|
18
18
|
'///',
|
|
19
19
|
false, [],
|
|
20
|
-
([, bs],
|
|
21
|
-
([, bs],
|
|
20
|
+
([, bs], _, output) => output.import(bs),
|
|
21
|
+
([, bs], _, output) => bs && output.import(bs.push(new Node(Command.Cancel)))))),
|
|
22
22
|
nodes => new List([new Node(html('i', defrag(unwrap(nodes))))])));
|