securemark 0.283.2 → 0.283.4

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 (44) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/index.js +144 -92
  3. package/markdown.d.ts +16 -8
  4. package/package.json +1 -1
  5. package/src/combinator/control/manipulation/indent.ts +1 -1
  6. package/src/combinator/control/manipulation/surround.ts +4 -4
  7. package/src/combinator/data/parser/context/delimiter.ts +46 -21
  8. package/src/combinator/data/parser/context.ts +6 -2
  9. package/src/parser/block/dlist.ts +1 -1
  10. package/src/parser/context.ts +10 -11
  11. package/src/parser/inline/annotation.ts +2 -2
  12. package/src/parser/inline/autolink/account.ts +14 -13
  13. package/src/parser/inline/autolink/anchor.ts +13 -12
  14. package/src/parser/inline/autolink/channel.ts +6 -3
  15. package/src/parser/inline/autolink/email.ts +4 -3
  16. package/src/parser/inline/autolink/hashnum.ts +10 -8
  17. package/src/parser/inline/autolink/hashtag.ts +10 -8
  18. package/src/parser/inline/autolink/url.ts +25 -19
  19. package/src/parser/inline/autolink.ts +3 -4
  20. package/src/parser/inline/bracket.ts +17 -14
  21. package/src/parser/inline/code.ts +1 -1
  22. package/src/parser/inline/deletion.ts +1 -1
  23. package/src/parser/inline/emphasis.test.ts +2 -2
  24. package/src/parser/inline/emphasis.ts +3 -3
  25. package/src/parser/inline/emstrong.ts +7 -7
  26. package/src/parser/inline/extension/index.ts +3 -3
  27. package/src/parser/inline/extension/indexee.ts +4 -2
  28. package/src/parser/inline/extension/placeholder.ts +2 -2
  29. package/src/parser/inline/html.ts +45 -43
  30. package/src/parser/inline/htmlentity.ts +5 -5
  31. package/src/parser/inline/insertion.ts +1 -1
  32. package/src/parser/inline/link.ts +11 -10
  33. package/src/parser/inline/mark.test.ts +2 -2
  34. package/src/parser/inline/mark.ts +3 -3
  35. package/src/parser/inline/math.ts +2 -2
  36. package/src/parser/inline/media.ts +2 -2
  37. package/src/parser/inline/reference.ts +2 -2
  38. package/src/parser/inline/remark.ts +3 -3
  39. package/src/parser/inline/ruby.ts +5 -4
  40. package/src/parser/inline/strong.test.ts +2 -2
  41. package/src/parser/inline/strong.ts +3 -3
  42. package/src/parser/inline/template.ts +2 -2
  43. package/src/parser/inline.test.ts +5 -2
  44. package/src/parser/visibility.ts +4 -4
@@ -10,7 +10,7 @@ export const code: CodeParser = creation(1, Recursion.ignore, validate('`', matc
10
10
 
11
11
  function format(text: string): string {
12
12
  assert(text.length > 0);
13
- return `${text[0]}${text[text.length - 1]}` === ' '
13
+ return `${text[0]}${text.at(-1)}` === ' '
14
14
  && text.trimStart()
15
15
  ? text.slice(1, -1)
16
16
  : text;
@@ -9,7 +9,7 @@ import { html, defrag } from 'typed-dom/dom';
9
9
 
10
10
  export const deletion: DeletionParser = lazy(() => creation(1, Recursion.inline, surround(
11
11
  str('~~', '~'),
12
- syntax(1, State.none,
12
+ syntax(0, State.none,
13
13
  some(union([
14
14
  some(inline, blankWith('\n', '~~')),
15
15
  open('\n', some(inline, '~'), true),
@@ -12,10 +12,8 @@ describe('Unit: parser/inline/emphasis', () => {
12
12
  assert.deepStrictEqual(inspect(parser('*a *')), [['*', 'a'], ' *']);
13
13
  assert.deepStrictEqual(inspect(parser('*a *')), [['*', 'a', ' '], ' *']);
14
14
  assert.deepStrictEqual(inspect(parser('*a\n*')), [['*', 'a'], '\n*']);
15
- assert.deepStrictEqual(inspect(parser('*a\nb*')), [['*', 'a'], '\nb*']);
16
15
  assert.deepStrictEqual(inspect(parser('*a\\ *')), [['*', 'a'], '\\ *']);
17
16
  assert.deepStrictEqual(inspect(parser('*a\\\n*')), [['*', 'a'], '\\\n*']);
18
- assert.deepStrictEqual(inspect(parser('*a\\\nb*')), [['*', 'a'], '\\\nb*']);
19
17
  assert.deepStrictEqual(inspect(parser('*a**b')), [['*', 'a', '**', 'b'], '']);
20
18
  assert.deepStrictEqual(inspect(parser('*a**b*')), [['*', 'a', '**', 'b', '*'], '']);
21
19
  assert.deepStrictEqual(inspect(parser('* *')), undefined);
@@ -35,6 +33,8 @@ describe('Unit: parser/inline/emphasis', () => {
35
33
  assert.deepStrictEqual(inspect(parser('*a*')), [['<em>a</em>'], '']);
36
34
  assert.deepStrictEqual(inspect(parser('*ab*')), [['<em>ab</em>'], '']);
37
35
  assert.deepStrictEqual(inspect(parser('*a**')), [['<em>a</em>'], '*']);
36
+ assert.deepStrictEqual(inspect(parser('*a\nb*')), [['<em>a<br>b</em>'], '']);
37
+ assert.deepStrictEqual(inspect(parser('*a\\\nb*')), [['<em>a<br>b</em>'], '']);
38
38
  });
39
39
 
40
40
  it('nest', () => {
@@ -11,11 +11,11 @@ import { html, defrag } from 'typed-dom/dom';
11
11
 
12
12
  export const emphasis: EmphasisParser = lazy(() => creation(1, Recursion.inline, surround(
13
13
  str('*', '*'),
14
- syntax(1, State.none,
14
+ syntax(0, State.none,
15
15
  startTight(some(union([
16
16
  strong,
17
- some(inline, blankWith('*'), [[/^\\?\n/, 9]]),
18
- open(some(inline, '*', [[/^\\?\n/, 9]]), union([
17
+ some(inline, blankWith('*')),
18
+ open(some(inline, '*'), union([
19
19
  emstrong,
20
20
  strong,
21
21
  emphasis,
@@ -11,16 +11,16 @@ import { html, defrag } from 'typed-dom/dom';
11
11
  import { unshift } from 'spica/array';
12
12
 
13
13
  const substrong: IntermediateParser<StrongParser> = lazy(() => some(union([
14
- some(inline, blankWith('**'), [[/^\\?\n/, 9]]),
15
- open(some(inline, '*', [[/^\\?\n/, 9]]), union([
14
+ some(inline, blankWith('**')),
15
+ open(some(inline, '*'), union([
16
16
  emstrong,
17
17
  strong,
18
18
  ])),
19
19
  ])));
20
20
  const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
21
21
  strong,
22
- some(inline, blankWith('*'), [[/^\\?\n/, 9]]),
23
- open(some(inline, '*', [[/^\\?\n/, 9]]), union([
22
+ some(inline, blankWith('*')),
23
+ open(some(inline, '*'), union([
24
24
  emstrong,
25
25
  strong,
26
26
  emphasis,
@@ -29,10 +29,10 @@ const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
29
29
 
30
30
  export const emstrong: EmStrongParser = lazy(() => creation(1, Recursion.inline, surround(
31
31
  str('***'),
32
- syntax(1, State.none,
32
+ syntax(0, State.none,
33
33
  startTight(some(union([
34
- some(inline, blankWith('*'), [[/^\\?\n/, 9]]),
35
- open(some(inline, '*', [[/^\\?\n/, 9]]), inline),
34
+ some(inline, blankWith('*')),
35
+ open(some(inline, '*'), inline),
36
36
  ])))),
37
37
  str(/^\*{1,3}/), false,
38
38
  ([, bs, cs], rest, context): Result<HTMLElement | string, typeof context> => {
@@ -12,12 +12,12 @@ import IndexParser = ExtensionParser.IndexParser;
12
12
  export const index: IndexParser = lazy(() => validate('[#', creation(1, Recursion.ignore, fmap(indexee(surround(
13
13
  '[#',
14
14
  constraint(State.index, false,
15
- syntax(2, State.linkers | State.media,
15
+ syntax(1, State.linkers | State.media,
16
16
  startTight(
17
17
  some(inits([
18
18
  inline,
19
19
  signature,
20
- ]), ']', [[/^\\?\n/, 9], [']', 2]])))),
20
+ ]), ']', [[/^\\?\n/, 9], [']', 1]])))),
21
21
  ']',
22
22
  false,
23
23
  ([, ns], rest) => [[html('a', { 'data-index': dataindex(ns) }, trimNodeEnd(defrag(ns)))], rest],
@@ -42,7 +42,7 @@ const bracket: IndexParser.SignatureParser.BracketParser = lazy(() => creation(0
42
42
  surround(str('('), some(union([bracket, txt]), ')'), str(')'), true, undefined, undefined, 3 | Backtrack.index),
43
43
  surround(str('['), some(union([bracket, txt]), ']'), str(']'), true, undefined, undefined, 3 | Backtrack.index),
44
44
  surround(str('{'), some(union([bracket, txt]), '}'), str('}'), true, undefined, undefined, 3 | Backtrack.index),
45
- surround(str('"'), precedence(3, some(txt, '"')), str('"'), true, undefined, undefined, 3 | Backtrack.index),
45
+ surround(str('"'), precedence(2, some(txt, '"')), str('"'), true, undefined, undefined, 3 | Backtrack.index),
46
46
  ])));
47
47
 
48
48
  export function dataindex(ns: readonly (string | HTMLElement)[]): string | undefined {
@@ -105,7 +105,7 @@ assert(baseR(61, 62) === 'Z');
105
105
  assert(baseR(62, 62) === '10');
106
106
 
107
107
  export function signature(source: Element | DocumentFragment): string {
108
- assert(!navigator.userAgent.includes('Chrome') || !source.querySelector('br:not(:has(+ :is(ul, ol)))'));
108
+ assert(!navigator.userAgent.includes('Chrome') || !source.querySelector('br:not(:has(+ :is(ul, ol)))') || source.nodeName === 'MARK');
109
109
  const target = source.cloneNode(true) as typeof source;
110
110
  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .label[data-label], .remark, rt, rp, br, .annotation, .reference, .checkbox, ul, ol'),
111
111
  len = es.length, i = 0; i < len; ++i) {
@@ -116,11 +116,13 @@ export function signature(source: Element | DocumentFragment): string {
116
116
  continue;
117
117
  case 'RT':
118
118
  case 'RP':
119
- case 'BR':
120
119
  case 'UL':
121
120
  case 'OL':
122
121
  el.remove();
123
122
  continue;
123
+ case 'BR':
124
+ el.replaceWith('\n');
125
+ continue;
124
126
  }
125
127
  switch (el.className) {
126
128
  case 'math':
@@ -13,8 +13,8 @@ import { html, defrag } from 'typed-dom/dom';
13
13
 
14
14
  export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => validate('[', creation(1, Recursion.inline, surround(
15
15
  str(/^\[[:^|]/),
16
- syntax(2, State.none,
17
- startTight(some(union([inline]), ']', [[']', 2]]))),
16
+ syntax(1, State.none,
17
+ startTight(some(union([inline]), ']', [[']', 1]]))),
18
18
  str(']'), false,
19
19
  ([, bs], rest) => [[
20
20
  html('span', {
@@ -18,48 +18,50 @@ const attrspecs = {
18
18
  Object.setPrototypeOf(attrspecs, null);
19
19
  Object.values(attrspecs).forEach(o => Object.setPrototypeOf(o, null));
20
20
 
21
- export const html: HTMLParser = lazy(() => validate('<', validate(/^<[a-z]+(?=[^\S\n]|>)/i, creation(1, Recursion.inline, syntax(4, State.none, union([
22
- focus(
23
- /^<wbr[^\S\n]*>/i,
24
- () => [[h('wbr')], '']),
25
- surround(
26
- // https://html.spec.whatwg.org/multipage/syntax.html#void-elements
27
- str(/^<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[^\S\n]|>)/i), some(union([attribute])), str(/^[^\S\n]*>/), true,
28
- ([as, bs = [], cs], rest) =>
29
- [[elem(as[0].slice(1), push(unshift(as, bs), cs), [], [])], rest]),
30
- match(
31
- new RegExp(String.raw`^<(${TAGS.join('|')})(?=[^\S\n]|>)`),
32
- memoize(
33
- ([, tag]) =>
34
- surround<HTMLParser.TagParser, string>(surround(
35
- str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
36
- subsequence([
37
- focus(/^[^\S\n]*\n/, some(inline)),
38
- some(open(/^\n?/, some(inline, blankWith('\n', `</${tag}>`), [[blankWith('\n', `</${tag}>`), 4]]), true)),
39
- ]),
40
- str(`</${tag}>`), true,
41
- ([as, bs = [], cs], rest) =>
42
- [[elem(tag, as, bs, cs)], rest],
43
- ([as, bs = []], rest) =>
44
- [[elem(tag, as, bs, [])], rest]))),
45
- match(
46
- /^<([a-z]+)(?=[^\S\n]|>)/i,
47
- memoize(
48
- ([, tag]) =>
49
- surround<HTMLParser.TagParser, string>(surround(
50
- str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
51
- subsequence([
52
- focus(/^[^\S\n]*\n/, some(inline)),
53
- some(inline, `</${tag}>`, [[`</${tag}>`, 4]]),
54
- ]),
55
- str(`</${tag}>`), true,
56
- ([as, bs = [], cs], rest) =>
57
- [[elem(tag, as, bs, cs)], rest],
58
- ([as, bs = []], rest) =>
59
- [[elem(tag, as, bs, [])], rest]),
60
- ([, tag]) => tag,
61
- new Clock(10000))),
62
- ]))))));
21
+ export const html: HTMLParser = lazy(() => validate('<', validate(/^<[a-z]+(?=[^\S\n]|>)/i, creation(1, Recursion.inline,
22
+ syntax(3, State.none,
23
+ union([
24
+ focus(
25
+ /^<wbr[^\S\n]*>/i,
26
+ () => [[h('wbr')], '']),
27
+ surround(
28
+ // https://html.spec.whatwg.org/multipage/syntax.html#void-elements
29
+ str(/^<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[^\S\n]|>)/i), some(union([attribute])), str(/^[^\S\n]*>/), true,
30
+ ([as, bs = [], cs], rest) =>
31
+ [[elem(as[0].slice(1), push(unshift(as, bs), cs), [], [])], rest]),
32
+ match(
33
+ new RegExp(String.raw`^<(${TAGS.join('|')})(?=[^\S\n]|>)`),
34
+ memoize(
35
+ ([, tag]) =>
36
+ surround<HTMLParser.TagParser, string>(surround(
37
+ str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
38
+ subsequence([
39
+ focus(/^[^\S\n]*\n/, some(inline)),
40
+ some(open(/^\n?/, some(inline, blankWith('\n', `</${tag}>`), [[blankWith('\n', `</${tag}>`), 3]]), true)),
41
+ ]),
42
+ str(`</${tag}>`), true,
43
+ ([as, bs = [], cs], rest) =>
44
+ [[elem(tag, as, bs, cs)], rest],
45
+ ([as, bs = []], rest) =>
46
+ [[elem(tag, as, bs, [])], rest]))),
47
+ match(
48
+ /^<([a-z]+)(?=[^\S\n]|>)/i,
49
+ memoize(
50
+ ([, tag]) =>
51
+ surround<HTMLParser.TagParser, string>(surround(
52
+ str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
53
+ subsequence([
54
+ focus(/^[^\S\n]*\n/, some(inline)),
55
+ some(inline, `</${tag}>`, [[`</${tag}>`, 3]]),
56
+ ]),
57
+ str(`</${tag}>`), true,
58
+ ([as, bs = [], cs], rest) =>
59
+ [[elem(tag, as, bs, cs)], rest],
60
+ ([as, bs = []], rest) =>
61
+ [[elem(tag, as, bs, [])], rest]),
62
+ ([, tag]) => tag,
63
+ new Clock(10000))),
64
+ ]))))));
63
65
 
64
66
  export const attribute: HTMLParser.AttributeParser = union([
65
67
  str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="[^"\n]*")?(?=[^\S\n]|>)/i),
@@ -208,7 +210,7 @@ const TAGS = Object.freeze([
208
210
 
209
211
  function elem(tag: string, as: string[], bs: (HTMLElement | string)[], cs: string[]): HTMLElement {
210
212
  assert(as.length > 0);
211
- assert(as[0][0] === '<' && as[as.length - 1].slice(-1) === '>');
213
+ assert(as[0][0] === '<' && as.at(-1)!.slice(-1) === '>');
212
214
  if (!tags.includes(tag)) return invalid('tag', `Invalid HTML tag name "${tag}"`, as, bs, cs);
213
215
  if (cs.length === 0) return invalid('tag', `Missing the closing HTML tag "</${tag}>"`, as, bs, cs);
214
216
  if (bs.length === 0) return invalid('content', `Missing the content`, as, bs, cs);
@@ -5,20 +5,20 @@ import { html } from 'typed-dom/dom';
5
5
  import { reduce } from 'spica/memoize';
6
6
 
7
7
  export const unsafehtmlentity: UnsafeHTMLEntityParser = creation(1, Recursion.ignore, validate('&', focus(
8
- /^&[0-9A-Za-z]+;/,
8
+ /^&[0-9A-Za-z]{1,99};/,
9
9
  ({ source }) => [[parse(source) ?? `\x1B${source}`], ''])));
10
10
 
11
11
  export const htmlentity: HTMLEntityParser = fmap(
12
12
  union([unsafehtmlentity]),
13
- ([test]) => [
14
- test[0] === '\x1B'
13
+ ([text]) => [
14
+ text[0] === '\x1B'
15
15
  ? html('span', {
16
16
  class: 'invalid',
17
17
  'data-invalid-syntax': 'htmlentity',
18
18
  'data-invalid-type': 'syntax',
19
19
  'data-invalid-message': 'Invalid HTML entity',
20
- }, test.slice(1))
21
- : test,
20
+ }, text.slice(1))
21
+ : text,
22
22
  ]);
23
23
 
24
24
  const parse = reduce((el => (entity: string): string | undefined => {
@@ -9,7 +9,7 @@ import { html, defrag } from 'typed-dom/dom';
9
9
 
10
10
  export const insertion: InsertionParser = lazy(() => creation(1, Recursion.inline, surround(
11
11
  str('++', '+'),
12
- syntax(1, State.none,
12
+ syntax(0, State.none,
13
13
  some(union([
14
14
  some(inline, blankWith('\n', '++')),
15
15
  open('\n', some(inline, '+'), true),
@@ -15,18 +15,18 @@ const optspec = {
15
15
  } as const;
16
16
  Object.setPrototypeOf(optspec, null);
17
17
 
18
- export const link: LinkParser = lazy(() => validate(['[', '{'], union([
18
+ export const link: LinkParser = lazy(() => union([
19
19
  medialink,
20
20
  textlink,
21
- ])));
21
+ ]));
22
22
 
23
- export const textlink: LinkParser.TextLinkParser = lazy(() => creation(1, Recursion.ignore,
23
+ export const textlink: LinkParser.TextLinkParser = lazy(() => validate(['[', '{'], creation(1, Recursion.ignore,
24
24
  constraint(State.link, false,
25
- syntax(2, State.linkers | State.media,
25
+ syntax(1, State.linkers | State.media,
26
26
  bind(reverse(tails([
27
27
  dup(surround(
28
28
  '[',
29
- trimBlankStart(some(union([inline]), ']', [[/^\\?\n/, 9], [']', 2]])),
29
+ trimBlankStart(some(union([inline]), ']', [[/^\\?\n/, 9], [']', 1]])),
30
30
  ']',
31
31
  true, undefined, undefined, 1 | Backtrack.bracket)),
32
32
  dup(surround(
@@ -40,11 +40,11 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => creation(1, Recurs
40
40
  assert(content[0] !== '');
41
41
  if (content.length !== 0 && trimNodeEnd(content = defrag(content)).length === 0) return;
42
42
  return [[parse(content, params, context)], rest];
43
- })))));
43
+ }))))));
44
44
 
45
- export const medialink: LinkParser.MediaLinkParser = lazy(() => creation(1, Recursion.ignore,
45
+ export const medialink: LinkParser.MediaLinkParser = lazy(() => validate(['[', '{'], creation(1, Recursion.ignore,
46
46
  constraint(State.link | State.media, false,
47
- syntax(2, State.linkers,
47
+ syntax(1, State.linkers,
48
48
  bind(reverse(sequence([
49
49
  dup(surround(
50
50
  '[',
@@ -53,7 +53,7 @@ export const medialink: LinkParser.MediaLinkParser = lazy(() => creation(1, Recu
53
53
  dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
54
54
  ])),
55
55
  ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) =>
56
- [[parse(defrag(content), params, context)], rest])))));
56
+ [[parse(defrag(content), params, context)], rest]))))));
57
57
 
58
58
  export const linemedialink: LinkParser.LineMediaLinkParser = surround(
59
59
  linebreak,
@@ -61,7 +61,8 @@ export const linemedialink: LinkParser.LineMediaLinkParser = surround(
61
61
  /^(?=[^\S\n]*(?:$|\n))/);
62
62
 
63
63
  export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() =>
64
- creation(1, Recursion.ignore, precedence(2,
64
+ creation(1, Recursion.ignore,
65
+ precedence(1,
65
66
  bind(reverse(tails([
66
67
  dup(surround(
67
68
  '[',
@@ -15,10 +15,8 @@ describe('Unit: parser/inline/mark', () => {
15
15
  assert.deepStrictEqual(inspect(parser('==a ==')), [['==', 'a'], ' ==']);
16
16
  assert.deepStrictEqual(inspect(parser('==a ==')), [['==', 'a', ' '], ' ==']);
17
17
  assert.deepStrictEqual(inspect(parser('==a\n==')), [['==', 'a'], '\n==']);
18
- assert.deepStrictEqual(inspect(parser('==a\nb==')), [['==', 'a'], '\nb==']);
19
18
  assert.deepStrictEqual(inspect(parser('==a\\ ==')), [['==', 'a'], '\\ ==']);
20
19
  assert.deepStrictEqual(inspect(parser('==a\\\n==')), [['==', 'a'], '\\\n==']);
21
- assert.deepStrictEqual(inspect(parser('==a\\\nb==')), [['==', 'a'], '\\\nb==']);
22
20
  assert.deepStrictEqual(inspect(parser('== ==')), undefined);
23
21
  assert.deepStrictEqual(inspect(parser('== a==')), undefined);
24
22
  assert.deepStrictEqual(inspect(parser('== a ==')), undefined);
@@ -33,6 +31,8 @@ describe('Unit: parser/inline/mark', () => {
33
31
  assert.deepStrictEqual(inspect(parser('==a=b==')), [['<mark id="mark::a=b=3lYfIw">a=b</mark>', '<a href="#mark::a=b=3lYfIw"></a>'], '']);
34
32
  assert.deepStrictEqual(inspect(parser('==\\===')), [['<mark id="mark::=">=</mark>', '<a href="#mark::="></a>'], '']);
35
33
  assert.deepStrictEqual(inspect(parser('==a===')), [['<mark id="mark::a">a</mark>', '<a href="#mark::a"></a>'], '=']);
34
+ assert.deepStrictEqual(inspect(parser('==a\nb==')), [['<mark id="mark::a_b=12Ta86">a<br>b</mark>', '<a href="#mark::a_b=12Ta86"></a>'], '']);
35
+ assert.deepStrictEqual(inspect(parser('==a\\\nb==')), [['<mark id="mark::a_b=12Ta86">a<br>b</mark>', '<a href="#mark::a_b=12Ta86"></a>'], '']);
36
36
  });
37
37
 
38
38
  it('nest', () => {
@@ -11,10 +11,10 @@ import { html, define, defrag } from 'typed-dom/dom';
11
11
  export const mark: MarkParser = lazy(() => creation(1, Recursion.inline, surround(
12
12
  str('==', '='),
13
13
  constraint(State.mark, false,
14
- syntax(1, State.none,
14
+ syntax(0, State.none,
15
15
  startTight(some(union([
16
- some(inline, blankWith('=='), [[/^\\?\n/, 9]]),
17
- open(some(inline, '=', [[/^\\?\n/, 9]]), mark),
16
+ some(inline, blankWith('==')),
17
+ open(some(inline, '='), mark),
18
18
  ]))))),
19
19
  str('=='), false,
20
20
  ([, bs], rest, { id }) => {
@@ -8,10 +8,10 @@ const forbiddenCommand = /\\(?:begin|tiny|huge|large)(?![a-z])/i;
8
8
 
9
9
  export const math: MathParser = lazy(() => validate('$', creation(1, Recursion.ignore, rewrite(
10
10
  union([
11
- surround('$', precedence(6, bracket), '$'),
11
+ surround('$', precedence(5, bracket), '$'),
12
12
  surround(
13
13
  /^\$(?![\s{}])/,
14
- precedence(3, some(union([
14
+ precedence(2, some(union([
15
15
  bracket,
16
16
  focus(/^(?:[ ([](?!\$)|\\[\\{}$]?|[!#%&')\x2A-\x5A\]^_\x61-\x7A|~])+/, some(unescsource)),
17
17
  ]))),
@@ -21,7 +21,7 @@ Object.setPrototypeOf(optspec, null);
21
21
  export const media: MediaParser = lazy(() => validate(['![', '!{'], creation(1, Recursion.ignore, open(
22
22
  '!',
23
23
  constraint(State.media, false,
24
- syntax(2, ~State.link,
24
+ syntax(1, ~State.link,
25
25
  bind(verify(fmap(tails([
26
26
  dup(surround(
27
27
  '[',
@@ -78,7 +78,7 @@ const bracket: MediaParser.TextParser.BracketParser = lazy(() => creation(0, Rec
78
78
  undefined, ([as, bs = []], rest) => [unshift(as, bs), rest], 3 | Backtrack.media),
79
79
  surround(str('{'), some(union([unsafehtmlentity, bracket, txt]), '}'), str('}'), true,
80
80
  undefined, ([as, bs = []], rest) => [unshift(as, bs), rest], 3 | Backtrack.media),
81
- surround(str('"'), precedence(3, some(union([unsafehtmlentity, txt]), '"')), str('"'), true,
81
+ surround(str('"'), precedence(2, some(union([unsafehtmlentity, txt]), '"')), str('"'), true,
82
82
  undefined, undefined, 3 | Backtrack.media),
83
83
  ])));
84
84
 
@@ -9,10 +9,10 @@ import { html, defrag } from 'typed-dom/dom';
9
9
  export const reference: ReferenceParser = lazy(() => creation(1, Recursion.ignore, surround(
10
10
  '[[',
11
11
  constraint(State.reference, false,
12
- syntax(6, State.annotation | State.reference | State.media,
12
+ syntax(1, State.annotation | State.reference | State.media,
13
13
  subsequence([
14
14
  abbr,
15
- trimBlankStart(some(inline, ']', [[/^\\?\n/, 9], [']', 2]])),
15
+ trimBlankStart(some(inline, ']', [[/^\\?\n/, 9], [']', 1]])),
16
16
  ]))),
17
17
  ']]',
18
18
  false,
@@ -7,13 +7,13 @@ import { memoize } from 'spica/memoize';
7
7
  import { unshift, push } from 'spica/array';
8
8
  import { html, defrag } from 'typed-dom/dom';
9
9
 
10
- export const remark: RemarkParser = lazy(() => validate('[%', creation(1, Recursion.inline, syntax(5, State.none, match(
10
+ export const remark: RemarkParser = lazy(() => validate('[%', creation(1, Recursion.inline, match(
11
11
  /^\[(%+)\s/,
12
12
  memoize(
13
13
  ([, fence]) =>
14
14
  surround(
15
15
  open(str(`[${fence}`), some(text, new RegExp(String.raw`^\s+${fence}\]|^\S`)), true),
16
- some(union([inline]), new RegExp(String.raw`^\s+${fence}\]`), [[new RegExp(String.raw`^\s+${fence}\]`), 5]]),
16
+ syntax(4, State.none, some(union([inline]), new RegExp(String.raw`^\s+${fence}\]`), [[new RegExp(String.raw`^\s+${fence}\]`), 4]])),
17
17
  close(some(text, /^\S/), str(`${fence}]`)), true,
18
18
  ([as, bs = [], cs], rest) => [[
19
19
  html('span', { class: 'remark' }, [
@@ -22,4 +22,4 @@ export const remark: RemarkParser = lazy(() => validate('[%', creation(1, Recurs
22
22
  ]),
23
23
  ], rest],
24
24
  ([as, bs = []], rest) => [unshift(as, bs), rest]),
25
- ([, fence]) => fence.length, {}))))));
25
+ ([, fence]) => fence.length, {})))));
@@ -8,18 +8,19 @@ import { isStartTightNodes } from '../visibility';
8
8
  import { unshift, push } from 'spica/array';
9
9
  import { html, defrag } from 'typed-dom/dom';
10
10
 
11
- export const ruby: RubyParser = lazy(() => validate('[', creation(1, Recursion.ignore, syntax(2, State.all, fmap(
11
+ export const ruby: RubyParser = lazy(() => validate('[', creation(1, Recursion.ignore, fmap(
12
+ syntax(1, State.all,
12
13
  sequence([
13
14
  bind(surround('[', str(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ']', false, undefined, undefined, 3 | Backtrack.ruby), ([source], rest, context) => {
14
15
  const ns = eval(text({ source, context }), [undefined])[0];
15
- ns && ns[ns.length - 1] === '' && ns.pop();
16
+ ns && ns.at(-1) === '' && ns.pop();
16
17
  return ns && isStartTightNodes(ns) ? [[ns], rest] : undefined;
17
18
  }),
18
19
  bind(surround('(', str(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ')', false, undefined, undefined, 3 | Backtrack.ruby), ([source], rest, context) => {
19
20
  const ns = eval(text({ source, context }), [undefined])[0];
20
21
  return ns && [[ns], rest];
21
22
  }),
22
- ]),
23
+ ])),
23
24
  ([texts, rubies]) => {
24
25
  switch (true) {
25
26
  case rubies.length <= texts.length:
@@ -50,7 +51,7 @@ export const ruby: RubyParser = lazy(() => validate('[', creation(1, Recursion.i
50
51
  [html('rp', '('), html('rt', rubies.join(' ').trim()), html('rp', ')')]))),
51
52
  ];
52
53
  }
53
- })))));
54
+ }))));
54
55
 
55
56
  const text: RubyParser.TextParser = creation(1, Recursion.ignore, ({ source, context }) => {
56
57
  const acc = [''];
@@ -12,10 +12,8 @@ describe('Unit: parser/inline/strong', () => {
12
12
  assert.deepStrictEqual(inspect(parser('**a **')), [['**', 'a'], ' **']);
13
13
  assert.deepStrictEqual(inspect(parser('**a **')), [['**', 'a', ' '], ' **']);
14
14
  assert.deepStrictEqual(inspect(parser('**a\n**')), [['**', 'a'], '\n**']);
15
- assert.deepStrictEqual(inspect(parser('**a\nb**')), [['**', 'a'], '\nb**']);
16
15
  assert.deepStrictEqual(inspect(parser('**a\\ **')), [['**', 'a'], '\\ **']);
17
16
  assert.deepStrictEqual(inspect(parser('**a\\\n**')), [['**', 'a'], '\\\n**']);
18
- assert.deepStrictEqual(inspect(parser('**a\\\nb**')), [['**', 'a'], '\\\nb**']);
19
17
  assert.deepStrictEqual(inspect(parser('**a*')), [['**', 'a', '*'], '']);
20
18
  assert.deepStrictEqual(inspect(parser('**a*b**')), [['**', 'a', '<em>b</em>', '*'], '']);
21
19
  assert.deepStrictEqual(inspect(parser('** **')), undefined);
@@ -33,6 +31,8 @@ describe('Unit: parser/inline/strong', () => {
33
31
  it('basic', () => {
34
32
  assert.deepStrictEqual(inspect(parser('**a**')), [['<strong>a</strong>'], '']);
35
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<br>b</strong>'], '']);
36
36
  });
37
37
 
38
38
  it('nest', () => {
@@ -10,10 +10,10 @@ import { html, defrag } from 'typed-dom/dom';
10
10
 
11
11
  export const strong: StrongParser = lazy(() => creation(1, Recursion.inline, surround(
12
12
  str('**', '*'),
13
- syntax(1, State.none,
13
+ syntax(0, State.none,
14
14
  startTight(some(union([
15
- some(inline, blankWith('**'), [[/^\\?\n/, 9]]),
16
- open(some(inline, '*', [[/^\\?\n/, 9]]), union([
15
+ some(inline, blankWith('**')),
16
+ open(some(inline, '*'), union([
17
17
  emstrong,
18
18
  strong,
19
19
  ])),
@@ -7,7 +7,7 @@ import { html } from 'typed-dom/dom';
7
7
 
8
8
  export const template: TemplateParser = lazy(() => creation(1, Recursion.ignore, surround(
9
9
  '{{',
10
- syntax(6, State.all, some(union([bracket, escsource]), '}', [['}}', 6]])),
10
+ syntax(1, State.all, some(union([bracket, escsource]), '}')),
11
11
  '}}',
12
12
  true,
13
13
  ([, ns = []], rest) => [[html('span', { class: 'template' }, `{{${ns.join('').replace(/\x1B/g, '')}}}`)], rest],
@@ -20,6 +20,6 @@ const bracket: TemplateParser.BracketParser = lazy(() => creation(0, Recursion.t
20
20
  undefined, ([as, bs = []], rest) => [unshift(as, bs), rest], 3 | Backtrack.template),
21
21
  surround(str('{'), some(union([bracket, escsource]), '}'), str('}'), true,
22
22
  undefined, ([as, bs = []], rest) => [unshift(as, bs), rest], 3 | Backtrack.template),
23
- surround(str('"'), precedence(3, some(escsource, /^"|^\\?\n/)), str('"'), true,
23
+ surround(str('"'), precedence(2, some(escsource, /^"|^\\?\n/)), str('"'), true,
24
24
  undefined, undefined, 3 | Backtrack.template),
25
25
  ])));
@@ -105,6 +105,7 @@ describe('Unit: parser/inline', () => {
105
105
  assert.deepStrictEqual(inspect(parser('<bdi>*<bdi>a</bdi>*</bdi>')), [['<bdi><em><bdi>a</bdi></em></bdi>'], '']);
106
106
  assert.deepStrictEqual(inspect(parser('<bdi>((<bdi>((a))</bdi>))</bdi>')), [['<bdi><sup class="annotation"><span><bdi><span class="paren">((a))</span></bdi></span></sup></bdi>'], '']);
107
107
  assert.deepStrictEqual(inspect(parser('<bdi>[[<bdi>[[a]]</bdi>]]</bdi>')), [['<bdi><sup class="reference"><span><bdi>[[a]]</bdi></span></sup></bdi>'], '']);
108
+ assert.deepStrictEqual(inspect(parser('"<bdi>("")</bdi>')), [['"', '<bdi><span class="paren">("")</span></bdi>'], '']);
108
109
  assert.deepStrictEqual(inspect(parser('*[*]')), [['*', '[', '*', ']'], '']);
109
110
  assert.deepStrictEqual(inspect(parser('*<*>')), [['<em>&lt;</em>', '>'], '']);
110
111
  assert.deepStrictEqual(inspect(parser('*a((b))*')), [['<em>a<sup class="annotation"><span>b</span></sup></em>'], '']);
@@ -150,7 +151,7 @@ describe('Unit: parser/inline', () => {
150
151
  assert.deepStrictEqual(inspect(parser('((((a))))')), [['<sup class="annotation"><span><span class="paren">((a))</span></span></sup>'], '']);
151
152
  assert.deepStrictEqual(inspect(parser('((${))}$')), [['(', '(', '<span class="math" translate="no" data-src="${))}$">${))}$</span>'], '']);
152
153
  assert.deepStrictEqual(inspect(parser('((a\nb))')), [['<span class="paren">(<span class="paren">(a<br>b)</span>)</span>'], '']);
153
- assert.deepStrictEqual(inspect(parser('"((""))')), [['"', '<sup class="annotation"><span>""</span></sup>'], '']);
154
+ assert.deepStrictEqual(inspect(parser('"((""))')), [['"', '(', '(', '"', '"', ')', ')'], '']);
154
155
  assert.deepStrictEqual(inspect(parser('[[[a]]')), [['[', '<sup class="reference"><span>a</span></sup>'], '']);
155
156
  assert.deepStrictEqual(inspect(parser('[[[[a]]')), [['[', '[', '<sup class="reference"><span>a</span></sup>'], '']);
156
157
  assert.deepStrictEqual(inspect(parser('[[[[a]]]]')), [['<sup class="reference"><span>[[a]]</span></sup>'], '']);
@@ -159,7 +160,7 @@ describe('Unit: parser/inline', () => {
159
160
  assert.deepStrictEqual(inspect(parser('[[[a]{b}]]')), [['<sup class="reference"><span><a class="link" href="b">a</a></span></sup>'], '']);
160
161
  assert.deepStrictEqual(inspect(parser('[(([a]{#}))]{#}')), [['<a class="link" href="#"><span class="paren">(<span class="paren">([a]{#})</span>)</span></a>'], '']);
161
162
  assert.deepStrictEqual(inspect(parser('[[${]]}$')), [['[', '[', '<span class="math" translate="no" data-src="${]]}$">${]]}$</span>'], '']);
162
- assert.deepStrictEqual(inspect(parser('"[[""]]')), [['"', '<sup class="reference"><span>""</span></sup>'], '']);
163
+ assert.deepStrictEqual(inspect(parser('"[[""]]')), [['"', '[', '[', '"', '"', ']', ']'], '']);
163
164
  assert.deepStrictEqual(inspect(parser('[==a==]{b}')), [['<a class="link" href="b">==a==</a>'], '']);
164
165
  assert.deepStrictEqual(inspect(parser('[[a](b)]{c}')), [['<a class="link" href="c"><ruby>a<rp>(</rp><rt>b</rt><rp>)</rp></ruby></a>'], '']);
165
166
  assert.deepStrictEqual(inspect(parser('[[[[[[[{a}')), [['[', '[', '[', '[', '[', '[', '[', '<a class="url" href="a">a</a>'], '']);
@@ -171,6 +172,8 @@ describe('Unit: parser/inline', () => {
171
172
  assert.deepStrictEqual(inspect(parser('[^a@b')), [['[^', '<a class="email" href="mailto:a@b">a@b</a>'], '']);
172
173
  assert.deepStrictEqual(inspect(parser('"[% *"*"*')), [['"', '[%', ' ', '*', '"', '*', '"', '*'], '']);
173
174
  assert.deepStrictEqual(inspect(parser('"[% "*"* %]')), [['"', '<span class="remark"><input type="checkbox"><span>[% "*"* %]</span></span>'], '']);
175
+ assert.deepStrictEqual(inspect(parser('"{{""}}')), [['"', '{', '{', '"', '"', '}', '}'], '']);
176
+ assert.deepStrictEqual(inspect(parser('[#http://a/(<bdi>)]</bdi>')), [['<a class="index" href="#index::http://a/(&lt;bdi&gt;)">http://a/(&lt;bdi&gt;)</a>', '<', '/', 'bdi', '>'], '']);
174
177
  });
175
178
 
176
179
  it('uri', () => {
@@ -120,7 +120,7 @@ export function isStartTightNodes(nodes: readonly (HTMLElement | string)[]): boo
120
120
  }
121
121
  //export function isEndTightNodes(nodes: readonly (HTMLElement | string)[]): boolean {
122
122
  // if (nodes.length === 0) return true;
123
- // return isVisible(nodes[nodes.length - 1], -1);
123
+ // return isVisible(nodes.at(-1)!, -1);
124
124
  //}
125
125
  function isVisible(node: HTMLElement | string, strpos?: number): boolean {
126
126
  switch (typeof node) {
@@ -186,11 +186,11 @@ function trimBlankEnd<T extends HTMLElement | string>(parser: Parser<T>): Parser
186
186
  //}
187
187
  export function trimNodeEnd<T extends HTMLElement | string>(nodes: T[]): T[] {
188
188
  const skip = nodes.length > 0 &&
189
- typeof nodes[nodes.length - 1] === 'object' &&
190
- nodes[nodes.length - 1]['className'] === 'indexer'
189
+ typeof nodes.at(-1) === 'object' &&
190
+ nodes.at(-1)!['className'] === 'indexer'
191
191
  ? [nodes.pop()!]
192
192
  : [];
193
- for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[nodes.length - 1], -1);) {
193
+ for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes.at(-1)!, -1);) {
194
194
  if (typeof node === 'string') {
195
195
  const pos = node.trimEnd().length;
196
196
  if (pos > 0) {