securemark 0.260.6 → 0.261.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.
Files changed (40) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/README.md +12 -12
  3. package/design.md +0 -4
  4. package/dist/index.js +34 -113
  5. package/markdown.d.ts +5 -21
  6. package/package.json +4 -4
  7. package/src/parser/api/parse.test.ts +1 -1
  8. package/src/parser/block/blockquote.test.ts +2 -2
  9. package/src/parser/block/dlist.test.ts +1 -1
  10. package/src/parser/block/extension/example.test.ts +1 -1
  11. package/src/parser/block/extension/fig.test.ts +1 -1
  12. package/src/parser/block/heading.test.ts +2 -2
  13. package/src/parser/block/paragraph.test.ts +1 -4
  14. package/src/parser/inline/autolink/anchor.test.ts +1 -0
  15. package/src/parser/inline/autolink/email.test.ts +3 -0
  16. package/src/parser/inline/autolink/email.ts +1 -1
  17. package/src/parser/inline/autolink/hashnum.test.ts +1 -2
  18. package/src/parser/inline/autolink/hashnum.ts +1 -1
  19. package/src/parser/inline/autolink/hashtag.test.ts +15 -12
  20. package/src/parser/inline/autolink/hashtag.ts +3 -3
  21. package/src/parser/inline/autolink/url.test.ts +1 -1
  22. package/src/parser/inline/autolink/url.ts +1 -1
  23. package/src/parser/inline/autolink.ts +13 -4
  24. package/src/parser/inline/deletion.test.ts +2 -2
  25. package/src/parser/inline/emphasis.test.ts +26 -35
  26. package/src/parser/inline/emphasis.ts +5 -12
  27. package/src/parser/inline/escape.ts +1 -10
  28. package/src/parser/inline/extension/index.test.ts +2 -2
  29. package/src/parser/inline/insertion.test.ts +2 -2
  30. package/src/parser/inline/link.test.ts +1 -1
  31. package/src/parser/inline/mark.test.ts +1 -1
  32. package/src/parser/inline/strong.test.ts +25 -32
  33. package/src/parser/inline/strong.ts +4 -8
  34. package/src/parser/inline.test.ts +18 -91
  35. package/src/parser/inline.ts +0 -3
  36. package/src/parser/locale/ja.ts +1 -9
  37. package/src/parser/locale.test.ts +1 -1
  38. package/src/parser/source/text.test.ts +9 -4
  39. package/src/parser/source/text.ts +9 -16
  40. package/src/parser/inline/emstrong.ts +0 -62
package/src/parser/inline/autolink/hashtag.test.ts CHANGED
@@ -20,9 +20,8 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
20
20
  assert.deepStrictEqual(inspect(parser('##')), [['##'], '']);
21
21
  assert.deepStrictEqual(inspect(parser('##a')), [['##a'], '']);
22
22
  assert.deepStrictEqual(inspect(parser('###a')), [['###a'], '']);
23
- assert.deepStrictEqual(inspect(parser(`#'`)), [[`#'`], '']);
24
- assert.deepStrictEqual(inspect(parser(`#a''`)), [[`#a''`], '']);
25
- assert.deepStrictEqual(inspect(parser('#_')), [['#_'], '']);
23
+ assert.deepStrictEqual(inspect(parser('#_')), [['#'], '_']);
24
+ assert.deepStrictEqual(inspect(parser('#_a')), [['#'], '_a']);
26
25
  assert.deepStrictEqual(inspect(parser('#(a)')), [['#'], '(a)']);
27
26
  assert.deepStrictEqual(inspect(parser('#{}')), [['#'], '{}']);
28
27
  assert.deepStrictEqual(inspect(parser('#{{}')), [['#'], '{{}']);
@@ -35,9 +34,9 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
35
34
  assert.deepStrictEqual(inspect(parser('a##1')), [['a##1'], '']);
36
35
  assert.deepStrictEqual(inspect(parser('a##b')), [['a##b'], '']);
37
36
  assert.deepStrictEqual(inspect(parser('あ#b')), [['あ#b'], '']);
38
- assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(127)}_`)), [[`#${'1'.repeat(127)}_`], '']);
39
- assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(127)}_a`)), [[`#${'1'.repeat(127)}_a`], '']);
40
- assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(127)}_'a`)), [[`#${'1'.repeat(127)}_'a`], '']);
37
+ assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(127)}_`)), [[`#${'1'.repeat(127)}`], '_']);
38
+ assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(127)}_a`)), [[`#${'1'.repeat(127)}`], '_a']);
39
+ assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(127)}_'a`)), [[`#${'1'.repeat(127)}`], `_'a`]);
41
40
  assert.deepStrictEqual(inspect(parser(' #a')), undefined);
42
41
  });
43
42
 
@@ -52,9 +51,8 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
52
51
  assert.deepStrictEqual(inspect(parser('#a(b')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '(b']);
53
52
  assert.deepStrictEqual(inspect(parser('#a(b)')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '(b)']);
54
53
  assert.deepStrictEqual(inspect(parser('#a_')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '_']);
55
- assert.deepStrictEqual(inspect(parser('#a_b')), [['<a class="hashtag" href="/hashtags/a_b">#a_b</a>'], '']);
56
- assert.deepStrictEqual(inspect(parser(`#a_'b`)), [['<a class="hashtag" href="/hashtags/a">#a</a>'], `_'b`]);
57
54
  assert.deepStrictEqual(inspect(parser('#a__b')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '__b']);
55
+ assert.deepStrictEqual(inspect(parser('#a_b')), [['<a class="hashtag" href="/hashtags/a_b">#a_b</a>'], '']);
58
56
  assert.deepStrictEqual(inspect(parser('#あ')), [['<a class="hashtag" href="/hashtags/あ">#あ</a>'], '']);
59
57
  assert.deepStrictEqual(inspect(parser('#👩')), [['<a class="hashtag" href="/hashtags/👩">#👩</a>'], '']);
60
58
  assert.deepStrictEqual(inspect(parser('#1a')), [['<a class="hashtag" href="/hashtags/1a">#1a</a>'], '']);
@@ -62,10 +60,15 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
62
60
  assert.deepStrictEqual(inspect(parser('#1👩')), [['<a class="hashtag" href="/hashtags/1👩">#1👩</a>'], '']);
63
61
  assert.deepStrictEqual(inspect(parser('#domain/a')), [['<a class="hashtag" href="https://domain/hashtags/a" target="_blank">#domain/a</a>'], '']);
64
62
  assert.deepStrictEqual(inspect(parser('#domain.co.jp/a')), [['<a class="hashtag" href="https://domain.co.jp/hashtags/a" target="_blank">#domain.co.jp/a</a>'], '']);
65
- // Reserved
66
- assert.deepStrictEqual(inspect(parser(`#a'`)), [[`#a'`], '']);
67
- assert.deepStrictEqual(inspect(parser(`#a'b`)), [[`#a'b`], '']);
68
- assert.deepStrictEqual(inspect(parser(`#a'_b`)), [[`#a'_b`], '']);
63
+ assert.deepStrictEqual(inspect(parser(`#'0`)), [[`<a class="hashtag" href="/hashtags/'0">#'0</a>`], '']);
64
+ assert.deepStrictEqual(inspect(parser(`#'00`)), [[`<a class="hashtag" href="/hashtags/'00">#'00</a>`], '']);
65
+ assert.deepStrictEqual(inspect(parser(`#1'`)), [[`<a class="hashtag" href="/hashtags/1'">#1'</a>`], '']);
66
+ assert.deepStrictEqual(inspect(parser(`#1''`)), [[`<a class="hashtag" href="/hashtags/1'">#1'</a>`], `'`]);
67
+ assert.deepStrictEqual(inspect(parser(`#a'`)), [[`<a class="hashtag" href="/hashtags/a'">#a'</a>`], '']);
68
+ assert.deepStrictEqual(inspect(parser(`#a''`)), [[`<a class="hashtag" href="/hashtags/a'">#a'</a>`], `'`]);
69
+ assert.deepStrictEqual(inspect(parser(`#a'b`)), [[`<a class="hashtag" href="/hashtags/a'b">#a'b</a>`], '']);
70
+ assert.deepStrictEqual(inspect(parser(`#a'_b`)), [[`<a class="hashtag" href="/hashtags/a'_b">#a'_b</a>`], '']);
71
+ assert.deepStrictEqual(inspect(parser(`#a_'b`)), [[`<a class="hashtag" href="/hashtags/a_'b">#a_'b</a>`], '']);
69
72
  });
70
73
 
71
74
  });
package/src/parser/inline/autolink/hashtag.ts CHANGED
@@ -20,9 +20,9 @@ export const hashtag: AutolinkParser.HashtagParser = lazy(() => fmap(rewrite(
20
20
  ([source]) => source.length <= 253 + 1),
21
21
  verify(
22
22
  str(new RegExp([
23
- /^(?=[0-9]{0,127}_?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji))/u.source,
24
- /(?:[^\p{C}\p{S}\p{P}\s]|emoji|_(?=[^\p{C}\p{S}\p{P}\s]|emoji)){1,128}/u.source,
25
- /(?!_?(?:[^\p{C}\p{S}\p{P}\s]|emoji)|')/u.source,
23
+ /^(?=(?:[0-9]{1,127}_?)?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'))/u.source,
24
+ /(?:[^\p{C}\p{S}\p{P}\s]|emoji|(?<!')'|_(?=[^\p{C}\p{S}\p{P}\s]|emoji|')){1,128}/u.source,
25
+ /(?!_?(?:[^\p{C}\p{S}\p{P}\s]|emoji|(?<!')'))/u.source,
26
26
  ].join('').replace(/emoji/g, emoji), 'u')),
27
27
  ([source]) => source.length <= 128),
28
28
  ]))),
package/src/parser/inline/autolink/url.test.ts CHANGED
@@ -58,7 +58,7 @@ describe('Unit: parser/inline/autolink/url', () => {
58
58
  assert.deepStrictEqual(inspect(parser('http://host`')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '`']);
59
59
  assert.deepStrictEqual(inspect(parser('http://host|')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '|']);
60
60
  assert.deepStrictEqual(inspect(parser('http://host&')), [['<a class="url" href="http://host&amp;" target="_blank">http://host&amp;</a>'], '']);
61
- assert.deepStrictEqual(inspect(parser('http://host_')), [['<a class="url" href="http://host_" target="_blank">http://host_</a>'], '']);
61
+ assert.deepStrictEqual(inspect(parser('http://host_')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '_']);
62
62
  assert.deepStrictEqual(inspect(parser('http://host$')), [['<a class="url" href="http://host$" target="_blank">http://host$</a>'], '']);
63
63
  assert.deepStrictEqual(inspect(parser('http://user@host')), [['<a class="url" href="http://user@host" target="_blank">http://user@host</a>'], '']);
64
64
  assert.deepStrictEqual(inspect(parser('http://host#@')), [['<a class="url" href="http://host#@" target="_blank">http://host#@</a>'], '']);
package/src/parser/inline/autolink/url.ts CHANGED
@@ -3,7 +3,7 @@ import { union, some, creation, precedence, validate, focus, rewrite, convert, s
3
3
  import { unsafelink } from '../link';
4
4
  import { unescsource } from '../../source';
5
5
 
6
- const closer = /^[-+*=~^,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
6
+ const closer = /^[-+*=~^_,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
7
7
 
8
8
  export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'https://'], rewrite(
9
9
  open(
package/src/parser/inline/autolink.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { AutolinkParser } from '../inline';
2
- import { union, some, syntax, constraint, validate, fmap } from '../../combinator';
2
+ import { union, some, syntax, constraint, validate, focus, fmap } from '../../combinator';
3
3
  import { url } from './autolink/url';
4
4
  import { email } from './autolink/email';
5
5
  import { channel } from './autolink/channel';
@@ -19,17 +19,26 @@ export const autolink: AutolinkParser = fmap(
19
19
  url,
20
20
  email,
21
21
  // Escape unmatched email-like strings.
22
- str(/^[0-9a-z]+(?:[.+_-][0-9a-z]+)*(?:@(?:[0-9a-z]+(?:[.-][0-9a-z]+)*)?)*/i),
22
+ focus(
23
+ /^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z])*(?:@(?:[0-9a-z]+(?:[.-][0-9a-z]+)*)?)*/i,
24
+ ({ source }) => {
25
+ if (source.length > 255 || source.includes('@')) return [[source], ''];
26
+ const i = source.indexOf('_');
27
+ if (i === -1) return [[source], ''];
28
+ return [[source.slice(0, i)], source.slice(i)];
29
+ }),
23
30
  channel,
24
31
  account,
25
32
  // Escape unmatched account-like strings.
26
33
  str(/^@+[0-9a-z]*(?:-[0-9a-z]+)*/i),
27
34
  // Escape invalid leading characters.
28
- str(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])(?=#)/u.source.replace('emoji', emoji), 'u')),
35
+ str(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji)(?=#)/u.source.replace('emoji', emoji), 'u')),
29
36
  hashtag,
30
37
  hashnum,
31
38
  // Escape unmatched hashtag-like strings.
32
- str(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])*/u.source.replace('emoji', emoji), 'u')),
39
+ str(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|')*/u.source.replace('emoji', emoji), 'u')),
40
+ // Escape invalid leading characters.
41
+ str(/^[0-9\p{Sc}](?=>)/u),
33
42
  anchor,
34
43
  ]))))),
35
44
  ns => ns.length === 1 ? ns : [stringify(ns)]);
package/src/parser/inline/deletion.test.ts CHANGED
@@ -37,8 +37,8 @@ describe('Unit: parser/inline/deletion', () => {
37
37
  });
38
38
 
39
39
  it('nest', () => {
40
- assert.deepStrictEqual(inspect(parser('~~*~~a~~*~~')), [['<del><em><del>a</del></em></del>'], '']);
41
- assert.deepStrictEqual(inspect(parser('~~*++a++*~~')), [['<del><em><ins>a</ins></em></del>'], '']);
40
+ assert.deepStrictEqual(inspect(parser('~~_~~a~~_~~')), [['<del><em><del>a</del></em></del>'], '']);
41
+ assert.deepStrictEqual(inspect(parser('~~_++a++_~~')), [['<del><em><ins>a</ins></em></del>'], '']);
42
42
  });
43
43
 
44
44
  });
package/src/parser/inline/emphasis.test.ts CHANGED
@@ -7,47 +7,38 @@ describe('Unit: parser/inline/emphasis', () => {
7
7
  const parser = (source: string) => some(emphasis)({ source, context: {} });
8
8
 
9
9
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('*')), undefined);
11
- assert.deepStrictEqual(inspect(parser('*a')), [['*', 'a'], '']);
12
- assert.deepStrictEqual(inspect(parser('*a *')), [['*', 'a'], ' *']);
13
- assert.deepStrictEqual(inspect(parser('*a *')), [['*', 'a', ' '], ' *']);
14
- assert.deepStrictEqual(inspect(parser('*a\n*')), [['*', 'a'], '\n*']);
15
- assert.deepStrictEqual(inspect(parser('*a\\ *')), [['*', 'a'], '\\ *']);
16
- assert.deepStrictEqual(inspect(parser('*a\\\n*')), [['*', 'a'], '\\\n*']);
17
- assert.deepStrictEqual(inspect(parser('*a**b')), [['*', 'a', '**', 'b'], '']);
18
- assert.deepStrictEqual(inspect(parser('*a**b*')), [['*', 'a', '**', 'b', '*'], '']);
19
- assert.deepStrictEqual(inspect(parser('* *')), undefined);
20
- assert.deepStrictEqual(inspect(parser('* a*')), undefined);
21
- assert.deepStrictEqual(inspect(parser('* a *')), undefined);
22
- assert.deepStrictEqual(inspect(parser('*\n*')), undefined);
23
- assert.deepStrictEqual(inspect(parser('*\na*')), undefined);
24
- assert.deepStrictEqual(inspect(parser('*\\ a*')), undefined);
25
- assert.deepStrictEqual(inspect(parser('*\\\na*')), undefined);
26
- assert.deepStrictEqual(inspect(parser('*<wbr>a*')), undefined);
27
- assert.deepStrictEqual(inspect(parser('**a**')), undefined);
28
- assert.deepStrictEqual(inspect(parser('***a***')), undefined);
29
- assert.deepStrictEqual(inspect(parser(' *a*')), undefined);
10
+ assert.deepStrictEqual(inspect(parser('_')), undefined);
11
+ assert.deepStrictEqual(inspect(parser('_a')), [['_', 'a'], '']);
12
+ assert.deepStrictEqual(inspect(parser('_a _')), [['_', 'a'], ' _']);
13
+ assert.deepStrictEqual(inspect(parser('_a _')), [['_', 'a', ' '], ' _']);
14
+ assert.deepStrictEqual(inspect(parser('_a\n_')), [['_', 'a'], '\n_']);
15
+ assert.deepStrictEqual(inspect(parser('_a\\ _')), [['_', 'a'], '\\ _']);
16
+ assert.deepStrictEqual(inspect(parser('_a\\\n_')), [['_', 'a'], '\\\n_']);
17
+ assert.deepStrictEqual(inspect(parser('_ _')), undefined);
18
+ assert.deepStrictEqual(inspect(parser('_ a_')), undefined);
19
+ assert.deepStrictEqual(inspect(parser('_ a _')), undefined);
20
+ assert.deepStrictEqual(inspect(parser('_\n_')), undefined);
21
+ assert.deepStrictEqual(inspect(parser('_\na_')), undefined);
22
+ assert.deepStrictEqual(inspect(parser('_\\ a_')), undefined);
23
+ assert.deepStrictEqual(inspect(parser('_\\\na_')), undefined);
24
+ assert.deepStrictEqual(inspect(parser('_<wbr>a_')), undefined);
25
+ assert.deepStrictEqual(inspect(parser(' _a_')), undefined);
30
26
  });
31
27
 
32
28
  it('basic', () => {
33
- assert.deepStrictEqual(inspect(parser('*a*')), [['<em>a</em>'], '']);
34
- assert.deepStrictEqual(inspect(parser('*ab*')), [['<em>ab</em>'], '']);
35
- assert.deepStrictEqual(inspect(parser('*a\nb*')), [['<em>a<br>b</em>'], '']);
36
- assert.deepStrictEqual(inspect(parser('*a\\\nb*')), [['<em>a<span class="linebreak"> </span>b</em>'], '']);
37
- assert.deepStrictEqual(inspect(parser('*a**')), [['<em>a</em>'], '*']);
29
+ assert.deepStrictEqual(inspect(parser('_a_')), [['<em>a</em>'], '']);
30
+ assert.deepStrictEqual(inspect(parser('_ab_')), [['<em>ab</em>'], '']);
31
+ assert.deepStrictEqual(inspect(parser('_a\nb_')), [['<em>a<br>b</em>'], '']);
32
+ assert.deepStrictEqual(inspect(parser('_a\\\nb_')), [['<em>a<span class="linebreak"> </span>b</em>'], '']);
38
33
  });
39
34
 
40
35
  it('nest', () => {
41
- assert.deepStrictEqual(inspect(parser('*a *b**')), [['<em>a <em>b</em></em>'], '']);
42
- assert.deepStrictEqual(inspect(parser('*a **b***')), [['<em>a <strong>b</strong></em>'], '']);
43
- assert.deepStrictEqual(inspect(parser('*a\\ *b**')), [['<em>a <em>b</em></em>'], '']);
44
- assert.deepStrictEqual(inspect(parser('*a&Tab;*b**')), [['<em>a\t<em>b</em></em>'], '']);
45
- assert.deepStrictEqual(inspect(parser('*a<wbr>*b**')), [['<em>a<wbr><em>b</em></em>'], '']);
46
- assert.deepStrictEqual(inspect(parser('*a**b**c*')), [['<em>a<strong>b</strong>c</em>'], '']);
47
- assert.deepStrictEqual(inspect(parser('*a**b**c*d')), [['<em>a<strong>b</strong>c</em>'], 'd']);
48
- assert.deepStrictEqual(inspect(parser('*`a`*')), [['<em><code data-src="`a`">a</code></em>'], '']);
49
- assert.deepStrictEqual(inspect(parser('*(*a*)*')), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);
50
- assert.deepStrictEqual(inspect(parser('*(**a**)*')), [['<em><span class="paren">(<strong>a</strong>)</span></em>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('_a _b__')), [['<em>a <em>b</em></em>'], '']);
37
+ assert.deepStrictEqual(inspect(parser('_a *b*_')), [['<em>a <strong>b</strong></em>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('_a\\ _b__')), [['<em>a <em>b</em></em>'], '']);
39
+ assert.deepStrictEqual(inspect(parser('_a&Tab;_b__')), [['<em>a\t<em>b</em></em>'], '']);
40
+ assert.deepStrictEqual(inspect(parser('_a<wbr>_b__')), [['<em>a<wbr><em>b</em></em>'], '']);
41
+ assert.deepStrictEqual(inspect(parser('_(_a_)_')), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);
51
42
  });
52
43
 
53
44
  });
package/src/parser/inline/emphasis.ts CHANGED
@@ -1,8 +1,6 @@
1
1
  import { EmphasisParser } from '../inline';
2
2
  import { union, some, syntax, surround, open, lazy } from '../../combinator';
3
3
  import { inline } from '../inline';
4
- import { emstrong } from './emstrong';
5
- import { strong } from './strong';
6
4
  import { str } from '../source';
7
5
  import { Syntax, State } from '../context';
8
6
  import { startTight, blankWith } from '../visibility';
@@ -10,17 +8,12 @@ import { html, defrag } from 'typed-dom/dom';
10
8
  import { unshift } from 'spica/array';
11
9
 
12
10
  export const emphasis: EmphasisParser = lazy(() => surround(
13
- str('*'),
11
+ str('_'),
14
12
  syntax(Syntax.none, 1, 1, State.none,
15
13
  startTight(some(union([
16
- strong,
17
- some(inline, blankWith('*')),
18
- open(some(inline, '*'), union([
19
- emstrong,
20
- strong,
21
- emphasis,
22
- ])),
23
- ])), '*')),
24
- str('*'), false,
14
+ some(inline, blankWith('_')),
15
+ open(some(inline, '_'), emphasis),
16
+ ])), '_')),
17
+ str('_'), false,
25
18
  ([, bs], rest) => [[html('em', defrag(bs))], rest],
26
19
  ([as, bs], rest) => [unshift(as, bs), rest]));
package/src/parser/inline/escape.ts CHANGED
@@ -6,20 +6,11 @@ import { str } from '../source';
6
6
  const repeat = str(/^(.)\1*/);
7
7
 
8
8
  export const escape: EscapeParser = union([({ source, context }) => {
9
- if (source.length < 3) return;
10
9
  switch (source[0]) {
11
- case '*':
12
- if (source.length < 4) return;
13
- assert(source[3]);
14
- return source[3] === source[0]
15
- && source[2] === source[0]
16
- && source[1] === source[0]
17
- ? repeat({ source, context })
18
- : undefined;
19
10
  case '+':
20
11
  case '~':
21
12
  case '=':
22
- assert(source[2]);
13
+ if (!source[2]) return;
23
14
  return source[2] === source[0]
24
15
  && source[1] === source[0]
25
16
  ? repeat({ source, context })
package/src/parser/inline/extension/index.test.ts CHANGED
@@ -53,7 +53,7 @@ describe('Unit: parser/inline/extension/index', () => {
53
53
  assert.deepStrictEqual(inspect(parser('[#\\\\]')), [['<a class="index" href="#index:\\">\\</a>'], '']);
54
54
  assert.deepStrictEqual(inspect(parser('[#A]')), [['<a class="index" href="#index:A">A</a>'], '']);
55
55
  assert.deepStrictEqual(inspect(parser('[#==]')), [['<a class="index" href="#index:==">==</a>'], '']);
56
- assert.deepStrictEqual(inspect(parser('[#*A*]')), [['<a class="index" href="#index:A"><em>A</em></a>'], '']);
56
+ assert.deepStrictEqual(inspect(parser('[#_A_]')), [['<a class="index" href="#index:A"><em>A</em></a>'], '']);
57
57
  assert.deepStrictEqual(inspect(parser('[#`A`]')), [['<a class="index" href="#index:`A`"><code data-src="`A`">A</code></a>'], '']);
58
58
  assert.deepStrictEqual(inspect(parser('[#${A}$]')), [['<a class="index" href="#index:${A}$"><span class="math" translate="no" data-src="${A}$">${A}$</span></a>'], '']);
59
59
  assert.deepStrictEqual(inspect(parser('[#[A](a)]')), [['<a class="index" href="#index:A"><ruby>A<rp>(</rp><rt>a</rt><rp>)</rp></ruby></a>'], '']);
@@ -80,7 +80,7 @@ describe('Unit: parser/inline/extension/index', () => {
80
80
  assert.deepStrictEqual(inspect(parser('[#a|#b ]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
81
81
  assert.deepStrictEqual(inspect(parser('[#a|#b ]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
82
82
  assert.deepStrictEqual(inspect(parser('[#a|#\\b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
83
- assert.deepStrictEqual(inspect(parser('[#a|#*b*]')), [['<a class="index" href="#index:*b*">a<span class="indexer" data-index="*b*"></span></a>'], '']);
83
+ assert.deepStrictEqual(inspect(parser('[#a|#_b_]')), [['<a class="index" href="#index:_b_">a<span class="indexer" data-index="_b_"></span></a>'], '']);
84
84
  assert.deepStrictEqual(inspect(parser('[#a|#b c]')), [['<a class="index" href="#index:b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
85
85
  assert.deepStrictEqual(inspect(parser('[#a|#b c]')), [['<a class="index" href="#index:b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
86
86
  assert.deepStrictEqual(inspect(parser('[#a|#[]]')), [['<a class="index" href="#index:[]">a<span class="indexer" data-index="[]"></span></a>'], '']);
package/src/parser/inline/insertion.test.ts CHANGED
@@ -37,8 +37,8 @@ describe('Unit: parser/inline/insertion', () => {
37
37
  });
38
38
 
39
39
  it('nest', () => {
40
- assert.deepStrictEqual(inspect(parser('++*++a++*++')), [['<ins><em><ins>a</ins></em></ins>'], '']);
41
- assert.deepStrictEqual(inspect(parser('++*~~a~~*++')), [['<ins><em><del>a</del></em></ins>'], '']);
40
+ assert.deepStrictEqual(inspect(parser('++_++a++_++')), [['<ins><em><ins>a</ins></em></ins>'], '']);
41
+ assert.deepStrictEqual(inspect(parser('++_~~a~~_++')), [['<ins><em><del>a</del></em></ins>'], '']);
42
42
  });
43
43
 
44
44
  });
package/src/parser/inline/link.test.ts CHANGED
@@ -170,7 +170,7 @@ describe('Unit: parser/inline/link', () => {
170
170
  assert.deepStrictEqual(inspect(parser('[((a))]{b}')), [['<a class="link" href="b"><span class="paren">((a))</span></a>'], '']);
171
171
  assert.deepStrictEqual(inspect(parser('[[[a]]]{b}')), [['<a class="link" href="b">[[a]]</a>'], '']);
172
172
  assert.deepStrictEqual(inspect(parser('[!http://host]{/}')), [['<a class="link" href="/" target="_blank"><img class="media" data-src="http://host" alt=""></a>'], '']);
173
- assert.deepStrictEqual(inspect(parser('[*a*]{b}')), [['<a class="link" href="b"><em>a</em></a>'], '']);
173
+ assert.deepStrictEqual(inspect(parser('[_a_]{b}')), [['<a class="link" href="b"><em>a</em></a>'], '']);
174
174
  });
175
175
 
176
176
  it('external', () => {
package/src/parser/inline/mark.test.ts CHANGED
@@ -40,7 +40,7 @@ describe('Unit: parser/inline/mark', () => {
40
40
  assert.deepStrictEqual(inspect(parser('==a\\ ==b====')), [['<mark>a <mark>b</mark></mark>'], '']);
41
41
  assert.deepStrictEqual(inspect(parser('==a&Tab;==b====')), [['<mark>a\t<mark>b</mark></mark>'], '']);
42
42
  assert.deepStrictEqual(inspect(parser('==a<wbr>==b====')), [['<mark>a<wbr><mark>b</mark></mark>'], '']);
43
- assert.deepStrictEqual(inspect(parser('==*==a==*==')), [['<mark><em><mark>a</mark></em></mark>'], '']);
43
+ assert.deepStrictEqual(inspect(parser('==_==a==_==')), [['<mark><em><mark>a</mark></em></mark>'], '']);
44
44
  });
45
45
 
46
46
  });
package/src/parser/inline/strong.test.ts CHANGED
@@ -7,44 +7,37 @@ describe('Unit: parser/inline/strong', () => {
7
7
  const parser = (source: string) => some(strong)({ source, context: {} });
8
8
 
9
9
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('**')), undefined);
11
- assert.deepStrictEqual(inspect(parser('**a')), [['**', 'a'], '']);
12
- assert.deepStrictEqual(inspect(parser('**a **')), [['**', 'a'], ' **']);
13
- assert.deepStrictEqual(inspect(parser('**a **')), [['**', 'a', ' '], ' **']);
14
- assert.deepStrictEqual(inspect(parser('**a\n**')), [['**', 'a'], '\n**']);
15
- assert.deepStrictEqual(inspect(parser('**a\\ **')), [['**', 'a'], '\\ **']);
16
- assert.deepStrictEqual(inspect(parser('**a\\\n**')), [['**', 'a'], '\\\n**']);
17
- assert.deepStrictEqual(inspect(parser('**a*')), [['**', 'a', '*'], '']);
18
- assert.deepStrictEqual(inspect(parser('**a*b**')), [['**', 'a', '<em>b</em>', '*'], '']);
19
- assert.deepStrictEqual(inspect(parser('** **')), undefined);
20
- assert.deepStrictEqual(inspect(parser('** a**')), undefined);
21
- assert.deepStrictEqual(inspect(parser('** a **')), undefined);
22
- assert.deepStrictEqual(inspect(parser('**\n**')), undefined);
23
- assert.deepStrictEqual(inspect(parser('**\na**')), undefined);
24
- assert.deepStrictEqual(inspect(parser('**\\ a**')), undefined);
25
- assert.deepStrictEqual(inspect(parser('**\\\na**')), undefined);
26
- assert.deepStrictEqual(inspect(parser('**<wbr>a**')), undefined);
27
- assert.deepStrictEqual(inspect(parser('***a***')), undefined);
28
- assert.deepStrictEqual(inspect(parser(' **a**')), undefined);
10
+ assert.deepStrictEqual(inspect(parser('*')), undefined);
11
+ assert.deepStrictEqual(inspect(parser('*a')), [['*', 'a'], '']);
12
+ assert.deepStrictEqual(inspect(parser('*a *')), [['*', 'a'], ' *']);
13
+ assert.deepStrictEqual(inspect(parser('*a *')), [['*', 'a', ' '], ' *']);
14
+ assert.deepStrictEqual(inspect(parser('*a\n*')), [['*', 'a'], '\n*']);
15
+ assert.deepStrictEqual(inspect(parser('*a\\ *')), [['*', 'a'], '\\ *']);
16
+ assert.deepStrictEqual(inspect(parser('*a\\\n*')), [['*', 'a'], '\\\n*']);
17
+ assert.deepStrictEqual(inspect(parser('* *')), undefined);
18
+ assert.deepStrictEqual(inspect(parser('* a*')), undefined);
19
+ assert.deepStrictEqual(inspect(parser('* a *')), undefined);
20
+ assert.deepStrictEqual(inspect(parser('*\n*')), undefined);
21
+ assert.deepStrictEqual(inspect(parser('*\na*')), undefined);
22
+ assert.deepStrictEqual(inspect(parser('*\\ a*')), undefined);
23
+ assert.deepStrictEqual(inspect(parser('*\\\na*')), undefined);
24
+ assert.deepStrictEqual(inspect(parser('*<wbr>a*')), undefined);
25
+ assert.deepStrictEqual(inspect(parser(' *a*')), undefined);
29
26
  });
30
27
 
31
28
  it('basic', () => {
32
- assert.deepStrictEqual(inspect(parser('**a**')), [['<strong>a</strong>'], '']);
33
- assert.deepStrictEqual(inspect(parser('**ab**')), [['<strong>ab</strong>'], '']);
34
- assert.deepStrictEqual(inspect(parser('**a\nb**')), [['<strong>a<br>b</strong>'], '']);
35
- assert.deepStrictEqual(inspect(parser('**a\\\nb**')), [['<strong>a<span class="linebreak"> </span>b</strong>'], '']);
29
+ assert.deepStrictEqual(inspect(parser('*a*')), [['<strong>a</strong>'], '']);
30
+ assert.deepStrictEqual(inspect(parser('*ab*')), [['<strong>ab</strong>'], '']);
31
+ assert.deepStrictEqual(inspect(parser('*a\nb*')), [['<strong>a<br>b</strong>'], '']);
32
+ assert.deepStrictEqual(inspect(parser('*a\\\nb*')), [['<strong>a<span class="linebreak"> </span>b</strong>'], '']);
36
33
  });
37
34
 
38
35
  it('nest', () => {
39
- assert.deepStrictEqual(inspect(parser('**a *b***')), [['<strong>a <em>b</em></strong>'], '']);
40
- assert.deepStrictEqual(inspect(parser('**a **b****')), [['<strong>a <strong>b</strong></strong>'], '']);
41
- assert.deepStrictEqual(inspect(parser('**a&Tab;**b****')), [['<strong>a\t<strong>b</strong></strong>'], '']);
42
- assert.deepStrictEqual(inspect(parser('**a<wbr>**b****')), [['<strong>a<wbr><strong>b</strong></strong>'], '']);
43
- assert.deepStrictEqual(inspect(parser('**a*b*c**')), [['<strong>a<em>b</em>c</strong>'], '']);
44
- assert.deepStrictEqual(inspect(parser('**a*b*c**d')), [['<strong>a<em>b</em>c</strong>'], 'd']);
45
- assert.deepStrictEqual(inspect(parser('**`a`**')), [['<strong><code data-src="`a`">a</code></strong>'], '']);
46
- assert.deepStrictEqual(inspect(parser('**(*a*)**')), [['<strong><span class="paren">(<em>a</em>)</span></strong>'], '']);
47
- assert.deepStrictEqual(inspect(parser('**(**a**)**')), [['<strong><span class="paren">(<strong>a</strong>)</span></strong>'], '']);
36
+ assert.deepStrictEqual(inspect(parser('*a _b_*')), [['<strong>a <em>b</em></strong>'], '']);
37
+ assert.deepStrictEqual(inspect(parser('*a *b**')), [['<strong>a <strong>b</strong></strong>'], '']);
38
+ assert.deepStrictEqual(inspect(parser('*a&Tab;*b**')), [['<strong>a\t<strong>b</strong></strong>'], '']);
39
+ assert.deepStrictEqual(inspect(parser('*a<wbr>*b**')), [['<strong>a<wbr><strong>b</strong></strong>'], '']);
40
+ assert.deepStrictEqual(inspect(parser('*(*a*)*')), [['<strong><span class="paren">(<strong>a</strong>)</span></strong>'], '']);
48
41
  });
49
42
 
50
43
  });
package/src/parser/inline/strong.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import { StrongParser } from '../inline';
2
2
  import { union, some, syntax, surround, open, lazy } from '../../combinator';
3
3
  import { inline } from '../inline';
4
- import { emstrong } from './emstrong';
5
4
  import { str } from '../source';
6
5
  import { Syntax, State } from '../context';
7
6
  import { startTight, blankWith } from '../visibility';
@@ -9,15 +8,12 @@ import { html, defrag } from 'typed-dom/dom';
9
8
  import { unshift } from 'spica/array';
10
9
 
11
10
  export const strong: StrongParser = lazy(() => surround(
12
- str('**'),
11
+ str('*'),
13
12
  syntax(Syntax.none, 1, 1, State.none,
14
13
  startTight(some(union([
15
- some(inline, blankWith('**')),
16
- open(some(inline, '*'), union([
17
- emstrong,
18
- strong,
19
- ])),
14
+ some(inline, blankWith('*')),
15
+ open(some(inline, '*'), strong),
20
16
  ])), '*')),
21
- str('**'), false,
17
+ str('*'), false,
22
18
  ([, bs], rest) => [[html('strong', defrag(bs))], rest],
23
19
  ([as, bs], rest) => [unshift(as, bs), rest]));