securemark 0.232.2 → 0.233.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.232.2",
+  "version": "0.233.2",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",

package/src/parser/api/parse.test.ts

@@ -53,10 +53,10 @@ describe('Unit: parser/api/parse', () => {
         ['<p>&lt;wbr&gt;<br>a</p>']);
       assert.deepStrictEqual(
         [...parse('[#\n<wbr>\n#]').children].map(el => el.outerHTML),
-        ['<p>[#<br>&lt;wbr&gt;<br>#]</p>']);
+        ['<p><span class="comment">[# &lt;wbr&gt; #]</span></p>']);
       assert.deepStrictEqual(
         [...parse('[#\n<wbr>\n#]\na').children].map(el => el.outerHTML),
-        ['<p>[#<br>&lt;wbr&gt;<br>#]<br>a</p>']);
+        ['<p><span class="comment">[# &lt;wbr&gt; #]</span><br>a</p>']);
     });
 
     it('linebreak', () => {
@@ -199,17 +199,17 @@ describe('Unit: parser/api/parse', () => {
     it('footnote', () => {
       const footnotes = { annotations: html('ol'), references: html('ol') };
       assert.deepStrictEqual(
-        [...parse('$-a\n$$\n$$\n\n(($-a[[b]][[c]]))', { footnotes }).children].map(el => el.outerHTML),
+        [...parse('$-a\n$$\n$$\n\n(($-a[[b]][[c*d*]]))', { footnotes }).children].map(el => el.outerHTML),
         [
           '<figure data-label="$-a" data-group="$" data-number="1" id="label:$-a"><div class="figcontent"><div class="math" translate="no">$$\n$$</div></div><span class="figindex">(1)</span><figcaption></figcaption></figure>',
-          '<p><sup class="annotation" id="annotation:ref:1" title="(1)[1][2]"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" id="reference:ref:1" title="b"><span hidden="">b</span><a href="#reference:def:1">[1]</a></sup><sup class="reference" id="reference:ref:2" title="c"><span hidden="">c</span><a href="#reference:def:2">[2]</a></sup></span><a href="#annotation:def:1">*1</a></sup></p>',
+          '<p><sup class="annotation" id="annotation:ref:1" title="(1)[1][2]"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" id="reference:ref:1" title="b"><span hidden="">b</span><a href="#reference:def:1">[1]</a></sup><sup class="reference" id="reference:ref:2" title="cd"><span hidden="">c<em>d</em></span><a href="#reference:def:2">[2]</a></sup></span><a href="#annotation:def:1">*1</a></sup></p>',
         ]);
       assert.deepStrictEqual(
         footnotes.annotations.outerHTML,
-        '<ol><li id="annotation:def:1"><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" id="reference:ref:1" title="b"><span hidden="">b</span><a href="#reference:def:1">[1]</a></sup><sup class="reference" id="reference:ref:2" title="c"><span hidden="">c</span><a href="#reference:def:2">[2]</a></sup><sup><a href="#annotation:ref:1">^1</a></sup></li></ol>');
+        '<ol><li id="annotation:def:1"><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" id="reference:ref:1" title="b"><span hidden="">b</span><a href="#reference:def:1">[1]</a></sup><sup class="reference" id="reference:ref:2" title="cd"><span hidden="">c<em>d</em></span><a href="#reference:def:2">[2]</a></sup><sup><a href="#annotation:ref:1">^1</a></sup></li></ol>');
       assert.deepStrictEqual(
         footnotes.references.outerHTML,
-        '<ol><li id="reference:def:1">b<sup><a href="#reference:ref:1">^1</a></sup></li><li id="reference:def:2">c<sup><a href="#reference:ref:2">^2</a></sup></li></ol>');
+        '<ol><li id="reference:def:1">b<sup><a href="#reference:ref:1">^1</a></sup></li><li id="reference:def:2">c<em>d</em><sup><a href="#reference:ref:2">^2</a></sup></li></ol>');
     });
 
     it('normalize', () => {

package/src/parser/api/parse.ts

@@ -1,5 +1,5 @@
 import { undefined, location } from 'spica/global';
-import { ObjectAssign } from 'spica/alias';
+import { ObjectAssign, ObjectCreate } from 'spica/alias';
 import { ParserOptions } from '../../..';
 import { MarkdownParser } from '../../../markdown';
 import { eval } from '../../combinator/data/parser';
@@ -24,13 +24,14 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
   assert(!context?.delimiters);
   context = context && url === '' && context.id === opts.id
     ? context
-    : ObjectAssign({ ...context, ...opts }, {
+    : ObjectAssign(ObjectCreate(context ?? {}), opts, {
         host: opts.host ?? context?.host ?? new ReadonlyURL(location.pathname, location.origin),
         url: url ? new ReadonlyURL(url as ':') : context?.url,
         id: opts.id ?? context?.id,
         footnotes: undefined,
         test: undefined,
       });
+  assert(context.caches === arguments[2]?.caches);
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const node = frag();
   let index = 0;

package/src/parser/block/extension/aside.ts

@@ -1,6 +1,6 @@
 import { ExtensionParser } from '../../block';
 import { block, validate, fence, creator, fmap } from '../../../combinator';
-import { identity } from '../../inline/extension/indexee';
+import { identity, text } from '../../inline/extension/indexee';
 import { parse } from '../../api/parse';
 import { html } from 'typed-dom';
 
@@ -35,9 +35,9 @@ export const aside: ExtensionParser.AsideParser = creator(100, block(validate('~
       'data-invalid-type': 'content',
       'data-invalid-description': 'Missing the title at the first line.',
     }, `${opener}${body}${closer}`)];
-    assert(identity(heading));
+    assert(identity(text(heading)));
     return [
-      html('aside', { id: identity(heading), class: 'aside' }, [
+      html('aside', { id: identity(text(heading)), class: 'aside' }, [
         document,
         annotations,
         references,

package/src/parser/block/extension/table.ts

@@ -113,9 +113,9 @@ function attributes(source: string) {
   assert(colspan?.[0] !== '0');
   rowspan === '1' ? rowspan = undefined : undefined;
   colspan === '1' ? colspan = undefined : undefined;
-  rowspan &&= max(0, min(+rowspan, 65534)) + '';
-  colspan &&= max(0, min(+colspan, 1000)) + '';
-  highlight &&= highlight.length > 0 ? highlight.length + '' : undefined;
+  rowspan &&= `${max(0, min(+rowspan, 65534))}`;
+  colspan &&= `${max(0, min(+colspan, 1000))}`;
+  highlight &&= highlight.length > 0 ? `${highlight.length}` : undefined;
   const valid = !highlight
     || source[0] === '#' && +highlight <= 1
     || source[0] === ':' && +highlight <= 6;

package/src/parser/block/mathblock.ts

@@ -16,7 +16,7 @@ export const mathblock: MathBlockParser = block(validate('$$', fmap(
   // Bug: Type mismatch between outer and inner.
   ([body, closer, opener, delim, param]: string[], _, { caches: { math: cache = undefined } = {} }) => [
     delim.length === 2 && closer && param.trimStart() === ''
-      ? cache?.get(`\n${body}`)?.cloneNode(true) as HTMLDivElement ||
+      ? cache?.get(`${delim}\n${body}${delim}`)?.cloneNode(true) as HTMLDivElement ||
         html('div', { class: 'math', translate: 'no' }, `${delim}\n${body}${delim}`)
       : html('pre', {
           class: 'invalid',

package/src/parser/block/paragraph.test.ts

@@ -47,12 +47,13 @@ describe('Unit: parser/block/paragraph', () => {
     });
 
     it('comment', () => {
-      assert.deepStrictEqual(inspect(parser('[# a #]')), [['<p>[# a #]</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('[# a #]b')), [['<p><sup class="comment" title="a"></sup>b</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('[# a #]\nb')), [['<p>[# a #]<br>b</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#\n<wbr>\n#]')), [['<p>[#<br>&lt;wbr&gt;<br>#]</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#\n<wbr>\n#]a')), [['<p><sup class="comment" title="<wbr>"></sup>a</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#\n<wbr>\n#]\na')), [['<p>[#<br>&lt;wbr&gt;<br>#]<br>a</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a #]')), [['<p><span class="comment">[# a #]</span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a #]b')), [['<p><span class="comment">[# a #]</span>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a #]\nb')), [['<p><span class="comment">[# a #]</span><br>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('[## a ##]')), [['<p><span class="comment">[## a ##]</span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#\n<wbr>\n#]')), [['<p><span class="comment">[# &lt;wbr&gt; #]</span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#\n<wbr>\n#]a')), [['<p><span class="comment">[# &lt;wbr&gt; #]</span>a</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#\n<wbr>\n#]\na')), [['<p><span class="comment">[# &lt;wbr&gt; #]</span><br>a</p>'], '']);
     });
 
     it('template', () => {

package/src/parser/block/reply/cite.ts

@@ -12,7 +12,7 @@ export const cite: ReplyParser.CiteParser = creator(line(fmap(validate(
   ]))),
   ([el, quotes = '']: [HTMLElement, string?]) => [
     html('span', { class: 'cite' }, defrag([
-      quotes + '>',
+      `${quotes}>`,
       define(el, { 'data-depth': `${quotes.length + 1}` }, el.innerText.slice(1)),
     ])),
     html('br'),

package/src/parser/inline/annotation.test.ts

@@ -18,15 +18,14 @@ describe('Unit: parser/inline/annotation', () => {
       assert.deepStrictEqual(inspect(parser('((\na))')), undefined);
       assert.deepStrictEqual(inspect(parser('((\\ a))')), undefined);
       assert.deepStrictEqual(inspect(parser('((\\\na))')), undefined);
+      assert.deepStrictEqual(inspect(parser('((<wbr>a))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a\n))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a\\\n))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a\nb))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a\\\nb))')), undefined);
-      assert.deepStrictEqual(inspect(parser('((<wbr>a))')), undefined);
-      assert.deepStrictEqual(inspect(parser('(([# a #]b))')), undefined);
-      assert.deepStrictEqual(inspect(parser('((a)b))')), undefined);
       assert.deepStrictEqual(inspect(parser('((*a\nb*))')), undefined);
       assert.deepStrictEqual(inspect(parser('((\\))')), undefined);
+      assert.deepStrictEqual(inspect(parser('((a)b))')), undefined);
       assert.deepStrictEqual(inspect(parser('(((a))')), undefined);
       assert.deepStrictEqual(inspect(parser(' ((a))')), undefined);
     });
@@ -39,7 +38,6 @@ describe('Unit: parser/inline/annotation', () => {
       assert.deepStrictEqual(inspect(parser('((a  ))')), [['<sup class="annotation">a</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('((a &nbsp;))')), [['<sup class="annotation">a</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('((a <wbr>))')), [['<sup class="annotation">a</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('((a [# b #]))')), [['<sup class="annotation">a <sup class="comment" title="b"></sup></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('((ab))')), [['<sup class="annotation">ab</sup>'], '']);
     });
 

package/src/parser/inline/comment.test.ts

@@ -10,52 +10,53 @@ describe('Unit: parser/inline/comment', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);
       assert.deepStrictEqual(inspect(parser('<')), undefined);
       assert.deepStrictEqual(inspect(parser('[#')), undefined);
-      assert.deepStrictEqual(inspect(parser('[##]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[# #]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[#  #]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[#   #]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[# #] #]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[#  #]  #]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[# [#')), undefined);
       assert.deepStrictEqual(inspect(parser('[#[#')), undefined);
-      assert.deepStrictEqual(inspect(parser('[# [# ')), undefined);
-      assert.deepStrictEqual(inspect(parser('[# [# a')), undefined);
-      assert.deepStrictEqual(inspect(parser('[# a[#')), [['<sup class="comment invalid">[# a</sup>'], '[#']);
-      assert.deepStrictEqual(inspect(parser('[# a [#')), [['<sup class="comment invalid">[# a </sup>'], '[#']);
-      assert.deepStrictEqual(inspect(parser('[# a [# ')), [['<sup class="comment invalid">[# a </sup>'], '[# ']);
-      assert.deepStrictEqual(inspect(parser('[# a [#\n')), [['<sup class="comment invalid">[# a </sup>'], '[#\n']);
-      assert.deepStrictEqual(inspect(parser('[# a [#b')), undefined);
-      assert.deepStrictEqual(inspect(parser('[# a [# b')), [['<sup class="comment invalid">[# a </sup>'], '[# b']);
-      assert.deepStrictEqual(inspect(parser('[# a [## b')), undefined);
-      assert.deepStrictEqual(inspect(parser('[## a [# b')), undefined);
       assert.deepStrictEqual(inspect(parser('[#a#]')), undefined);
       assert.deepStrictEqual(inspect(parser('[#a b#]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[# ')), [['[', '#', ' '], '']);
+      assert.deepStrictEqual(inspect(parser('[# \n a')), [['[', '#', '<br>', ' ', 'a'], '']);
+      assert.deepStrictEqual(inspect(parser('[##]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[# #]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[# #] #]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[# [#')), [['[', '#', ' ', '[', '#'], '']);
+      assert.deepStrictEqual(inspect(parser('[# [# ')), [['[', '#', ' ', '[', '#', ' '], '']);
+      assert.deepStrictEqual(inspect(parser('[# [# a')), [['[', '#', ' ', '[', '#', ' ', 'a'], '']);
+      assert.deepStrictEqual(inspect(parser('[# [# a #]')), [['[', '#', ' ', '<span class="comment">[# a #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a[#')), [['[', '#', ' ', 'a', '[', '#'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a [#')), [['[', '#', ' ', 'a', ' ', '[', '#'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a [# ')), [['[', '#', ' ', 'a', ' ', '[', '#', ' '], '']);
+      assert.deepStrictEqual(inspect(parser('[# a [# b')), [['[', '#', ' ', 'a', ' ', '[', '#', ' ', 'b'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a [## b')), [['[', '#', ' ', 'a', ' ', '[', '#', '#', ' ', 'b'], '']);
+      assert.deepStrictEqual(inspect(parser('[## a [# b')), [['[', '#', '#', ' ', 'a', ' ', '[', '#', ' ', 'b'], '']);
       assert.deepStrictEqual(inspect(parser('[#\\ a #]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[# a#]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[# a##]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[# a ##]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[## a #]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[# &a; #]')), [['<sup class="comment invalid">[# &amp;a; #]</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a\\ #]')), [['[', '#', ' ', 'a', ' ', '#', ']'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a#]')), [['[', '#', ' ', 'a#', ']'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a ##]')), [['[', '#', ' ', 'a', ' ', '##', ']'], '']);
+      assert.deepStrictEqual(inspect(parser('[# [## #]')), [['[', '#', ' ', '[', '#', '#', ' ', '#', ']'], '']);
+      assert.deepStrictEqual(inspect(parser('[## [# ##]')), [['[', '#', '#', ' ', '[', '#', ' ', '##', ']'], '']);
+      assert.deepStrictEqual(inspect(parser('[## a #]')), [['[', '#', '#', ' ', 'a', ' ', '#', ']'], '']);
       assert.deepStrictEqual(inspect(parser(' [# a #]')), undefined);
     });
 
     it('basic', () => {
-      assert.deepStrictEqual(inspect(parser('[# a #]')), [['<sup class="comment" title="a"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[# a b #]')), [['<sup class="comment" title="a b"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[# a\nb #]')), [['<sup class="comment" title="a\nb"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[# a\\ #]')), [['<sup class="comment" title="a\\"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[# a #] #]')), [['<sup class="comment" title="a"></sup>'], ' #]']);
-      assert.deepStrictEqual(inspect(parser('[# ##] #]')), [['<sup class="comment" title="##]"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[# [## #]')), [['<sup class="comment" title="[##"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[# [## a ##] #]')), [['<sup class="comment" title="[## a ##]"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[## a ##]')), [['<sup class="comment" title="a"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[## #] ##]')), [['<sup class="comment" title="#]"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[## [# ##]')), [['<sup class="comment" title="[#"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[## [# a #] ##]')), [['<sup class="comment" title="[# a #]"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[# a #]b')), [['<sup class="comment" title="a"></sup>'], 'b']);
-      assert.deepStrictEqual(inspect(parser('[#\na\n#]')), [['<sup class="comment" title="a"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[# &copy; #]')), [['<sup class="comment" title="©"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[# &amp;copy; #]')), [['<sup class="comment" title="&amp;copy;"></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#  #]')), [['<span class="comment">[#  #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#   #]')), [['<span class="comment">[#  #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a #]')), [['<span class="comment">[# a #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a b #]')), [['<span class="comment">[# a b #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a\nb #]')), [['<span class="comment">[# a<br>b #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a #] #]')), [['<span class="comment">[# a #]</span>'], ' #]']);
+      assert.deepStrictEqual(inspect(parser('[# ##] #]')), [['<span class="comment">[# ##] #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# [# a #] #]')), [['<span class="comment">[# <span class="comment">[# a #]</span> #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# [## a ##] #]')), [['<span class="comment">[# <span class="comment">[## a ##]</span> #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[## a ##]')), [['<span class="comment">[## a ##]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[## #] ##]')), [['<span class="comment">[## #] ##]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[## [# a #] ##]')), [['<span class="comment">[## <span class="comment">[# a #]</span> ##]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# a #]b')), [['<span class="comment">[# a #]</span>'], 'b']);
+      assert.deepStrictEqual(inspect(parser('[#\na\n#]')), [['<span class="comment">[# a #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# &a; #]')), [['<span class="comment">[# <span class="invalid">&amp;a;</span> #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# &copy; #]')), [['<span class="comment">[# © #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# &amp;copy; #]')), [['<span class="comment">[# &amp;copy; #]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[# \\ a #]')), [['<span class="comment">[#  a #]</span>'], '']);
     });
 
   });

package/src/parser/inline/comment.ts

@@ -1,31 +1,24 @@
 import { CommentParser } from '../inline';
-import { union, some, validate, creator, match } from '../../combinator';
 import { eval } from '../../combinator/data/parser';
-import { unsafehtmlentity } from './htmlentity';
-import { unescsource } from '../source';
-import { html } from 'typed-dom';
+import { union, some, validate, creator, surround, match, lazy } from '../../combinator';
+import { inline } from '../inline';
+import { text, str } from '../source';
+import { html, defrag } from 'typed-dom';
+import { memoize } from 'spica/memoize';
+import { unshift, push, pop } from 'spica/array';
 
-export const comment: CommentParser = creator(validate('[#', match(
-  /^\[(#+)(?!\S|\s+\1\]|\s*\[\1(?:$|\s))((?:\s+\S+)+?)(?:\s+(\1\])|\s*(?=\[\1(?:$|\s)))/,
-  ([whole, , body, closer]) => (rest, context) => {
-    [whole, body] = `${whole}\0${body.trimStart()}`.replace(/\x1B/g, '').split('\0', 2);
-    if (!closer) return [[html('sup', {
-      class: 'comment invalid',
-      'data-invalid-syntax': 'comment',
-      'data-invalid-type': 'content',
-      'data-invalid-description': 'Comment syntax using the same level cannot start in another comment syntax.',
-    }, whole)], rest];
-    const title = eval(some(text)(body, context), []).join('').trim();
-    if (title.includes('\0')) return [[html('sup', {
-      class: 'comment invalid',
-      'data-invalid-syntax': 'comment',
-      'data-invalid-type': 'content',
-      'data-invalid-description': `Invalid HTML entitiy "${title.match(/\0&[0-9A-Za-z]+;/)![0].slice(1)}".`,
-    }, whole)], rest];
-    return [[html('sup', { class: 'comment', title })], rest];
-  })));
-
-const text: CommentParser.TextParser = union([
-  unsafehtmlentity,
-  unescsource,
-]);
+export const comment: CommentParser = lazy(() => creator(validate('[#', match(
+  /^(?=\[(#+)\s)/,
+  memoize(
+  ([, fence], closer = new RegExp(String.raw`^\s+${fence}\]`)) =>
+    surround(
+      str(/^\[(\S+)\s+(?!\1\])/),
+      union([some(inline, closer)]),
+      str(closer), true,
+      ([, bs = []], rest) => [[
+        html('span',
+          { class: 'comment' },
+          defrag(push(unshift([`[${fence} `], bs), [` ${fence}]`]))),
+      ], rest],
+      ([as, bs = []], rest, context) => [unshift(pop(eval(some(text)(`${as[0]}!`, context))!)[0], bs), rest]),
+  ([, fence]) => fence)))));

package/src/parser/inline/deletion.test.ts

@@ -17,7 +17,7 @@ describe('Unit: parser/inline/deletion', () => {
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('~~a~~')), [['<del>a</del>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~ab~~')), [['<del>ab</del>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~a~b~~')), [['<del>a~b</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~a ~~')), [['<del>a </del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~ ~~')), [['<del> </del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~ a~~')), [['<del> a</del>'], '']);
@@ -26,7 +26,6 @@ describe('Unit: parser/inline/deletion', () => {
       assert.deepStrictEqual(inspect(parser('~~\na~~')), [['<del><br>a</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~\\\na~~')), [['<del><span class="linebreak"> </span>a</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~<wbr>a~~')), [['<del><wbr>a</del>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~[# a #]b~~')), [['<del><sup class="comment" title="a"></sup>b</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~a\n~~')), [['<del>a</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~a\nb~~')), [['<del>a<br>b</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~a\\\nb~~')), [['<del>a<span class="linebreak"> </span>b</del>'], '']);

package/src/parser/inline/emphasis.test.ts

@@ -15,7 +15,6 @@ describe('Unit: parser/inline/emphasis', () => {
       assert.deepStrictEqual(inspect(parser('*a\\\n*')), [['*', 'a', '<span class="linebreak"> </span>'], '*']);
       assert.deepStrictEqual(inspect(parser('*a**b')), [['*', 'a', '**', 'b'], '']);
       assert.deepStrictEqual(inspect(parser('*a**b*')), [['*', 'a', '**', 'b', '*'], '']);
-      assert.deepStrictEqual(inspect(parser('*a [# b #]*')), [['*', 'a', ' ', '<sup class="comment" title="b"></sup>'], '*']);
       assert.deepStrictEqual(inspect(parser('* *')), undefined);
       assert.deepStrictEqual(inspect(parser('* a*')), undefined);
       assert.deepStrictEqual(inspect(parser('* a *')), undefined);
@@ -24,7 +23,6 @@ describe('Unit: parser/inline/emphasis', () => {
       assert.deepStrictEqual(inspect(parser('*\\ a*')), undefined);
       assert.deepStrictEqual(inspect(parser('*\\\na*')), undefined);
       assert.deepStrictEqual(inspect(parser('*<wbr>a*')), undefined);
-      assert.deepStrictEqual(inspect(parser('*[# a #]b*')), undefined);
       assert.deepStrictEqual(inspect(parser('**a**')), undefined);
       assert.deepStrictEqual(inspect(parser('***a***')), undefined);
       assert.deepStrictEqual(inspect(parser(' *a*')), undefined);
@@ -41,7 +39,6 @@ describe('Unit: parser/inline/emphasis', () => {
     it('nest', () => {
       assert.deepStrictEqual(inspect(parser('*a**b**c*')), [['<em>a<strong>b</strong>c</em>'], '']);
       assert.deepStrictEqual(inspect(parser('*a**b**c*d')), [['<em>a<strong>b</strong>c</em>'], 'd']);
-      assert.deepStrictEqual(inspect(parser('*a[# b #]*')), [['<em>a<sup class="comment" title="b"></sup></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*`a`*')), [['<em><code data-src="`a`">a</code></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*<small>*')), [['<em>&lt;small&gt;</em>'], '']);
       assert.deepStrictEqual(inspect(parser('*(*a*)*')), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);

package/src/parser/inline/extension/index.test.ts

@@ -19,7 +19,6 @@ describe('Unit: parser/inline/extension/index', () => {
       assert.deepStrictEqual(inspect(parser('[#\\\n]')), undefined);
       assert.deepStrictEqual(inspect(parser('[#\\]')), undefined);
       assert.deepStrictEqual(inspect(parser('[#a')), undefined);
-      assert.deepStrictEqual(inspect(parser('[#[# a #]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[#*a\nb*]')), undefined);
       assert.deepStrictEqual(inspect(parser('[#a|#\n]')), undefined);
       assert.deepStrictEqual(inspect(parser('[#a|#\\\n]')), undefined);
@@ -39,7 +38,7 @@ describe('Unit: parser/inline/extension/index', () => {
       assert.deepStrictEqual(inspect(parser('[#a  b]')), [['<a class="index" href="#index:a_b">a  b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a &nbsp;]')), [['<a class="index" href="#index:a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a <wbr>]')), [['<a class="index" href="#index:a">a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a [# b #]]')), [['<a class="index" href="#index:a">a <sup class="comment" title="b"></sup></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a [# b #]]')), [['<a class="index" href="#index:a">a <span class="comment">[# b #]</span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a\\ ]')), [['<a class="index" href="#index:a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a\\ b]')), [['<a class="index" href="#index:a_b">a b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#[]]')), [['<a class="index" href="#index:[]">[]</a>'], '']);
@@ -55,6 +54,8 @@ describe('Unit: parser/inline/extension/index', () => {
       assert.deepStrictEqual(inspect(parser('[#@a]')), [['<a class="index" href="#index:@a">@a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#http://host]')), [['<a class="index" href="#index:http://host">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#!http://host]')), [['<a class="index" href="#index:!http://host">!http://host</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#[#  #]]')), [['<a class="index"><span class="comment">[#  #]</span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#[# a #]]')), [['<a class="index"><span class="comment">[# a #]</span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a((b))]')), [['<a class="index" href="#index:a((b))">a<span class="paren">((b))</span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a[[b]]]')), [['<a class="index" href="#index:a[[b]]">a[[b]]</a>'], '']);
     });
@@ -82,7 +83,7 @@ describe('Unit: parser/inline/extension/index', () => {
       assert.deepStrictEqual(inspect(parser('[#a  |#b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a &nbsp;|#b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a <wbr>|#b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a [# b #]|#b]')), [['<a class="index" href="#index:b">a <sup class="comment" title="b"></sup><span class="indexer" data-index="b"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a [# b #]|#b]')), [['<a class="index" href="#index:b">a <span class="comment">[# b #]</span><span class="indexer" data-index="b"></span></a>'], '']);
     });
 
   });

package/src/parser/inline/extension/index.ts

@@ -2,7 +2,7 @@ import { undefined } from 'spica/global';
 import { ExtensionParser } from '../../inline';
 import { union, some, validate, guard, context, creator, surround, open, lazy, fmap } from '../../../combinator';
 import { inline } from '../../inline';
-import { indexee, identify } from './indexee';
+import { indexee, identity } from './indexee';
 import { txt, str } from '../../source';
 import { startTight, trimNodeEnd } from '../../util';
 import { html, define, defrag } from 'typed-dom';
@@ -44,7 +44,7 @@ const signature: IndexParser.SignatureParser = lazy(() => creator(fmap(open(
   '|#',
   startTight(some(union([bracket, txt]), ']', /^\\?\n/))),
   ns => [
-    html('span', { class: 'indexer', 'data-index': identify(join(ns).trim()).slice(6) }),
+    html('span', { class: 'indexer', 'data-index': identity(join(ns)).slice(6) }),
   ])));
 
 const bracket: IndexParser.SignatureParser.BracketParser = lazy(() => creator(union([

package/src/parser/inline/extension/indexee.ts

@@ -6,12 +6,17 @@ import { define } from 'typed-dom';
 
 export function indexee<P extends Parser<unknown, MarkdownParser.Context>>(parser: P): P;
 export function indexee(parser: Parser<HTMLElement, MarkdownParser.Context>): Parser<HTMLElement> {
-  return fmap(parser, ([el], _, { id }) => [define(el, { id: id !== '' && identity(el) || undefined })]);
+  return fmap(parser, ([el], _, { id }) => [define(el, { id: id !== '' && identity(text(el)) || undefined })]);
 }
 
-export function identity(source: HTMLElement | DocumentFragment): string {
-  return identify(text(source).trim());
+export function identity(text: string): string {
+  assert(!text.includes('\n'));
+  text &&= text.trim();
+  return text && `index:${text.replace(/\s+/g, '_').slice(0, 101).replace(/^(.{97}).{4}$/, '$1...')}`;
 }
+assert(identity('0'.repeat(100)).slice(6) === '0'.repeat(100));
+assert(identity('0'.repeat(101)).slice(6) === '0'.repeat(97) + '...');
+assert(identity('0'.repeat(200)).slice(6) === '0'.repeat(97) + '...');
 
 export function text(source: HTMLElement | DocumentFragment): string {
   assert(source instanceof DocumentFragment || !source.matches('.indexer'));
@@ -22,34 +27,32 @@ export function text(source: HTMLElement | DocumentFragment): string {
   if (indexer) return indexer.getAttribute('data-index')!;
   const target = source.cloneNode(true) as typeof source;
   for (
-    let es = target.querySelectorAll('code[data-src], .math[data-src], rt, rp, .reference'),
+    let es = target.querySelectorAll('code[data-src], .math[data-src], .comment, rt, rp, .reference'),
         i = 0, len = es.length; i < len; ++i) {
     const el = es[i];
     switch (el.tagName) {
+      case 'CODE':
+        define(el, el.getAttribute('data-src')!);
+        continue;
       case 'RT':
       case 'RP':
         el.remove();
         continue;
-      case 'SUP':
-        el.firstChild!.remove();
-        continue;
-      default:
+    }
+    switch (el.className) {
+      case 'math':
         define(el, el.getAttribute('data-src')!);
         continue;
+      case 'comment':
+        el.remove();
+        continue;
+      case 'reference':
+        assert(el.firstElementChild?.hasAttribute('hidden'));
+        el.firstChild!.remove();
+        continue;
     }
   }
   // Better:
   //return target.innerText;
   return target.textContent!;
 }
-
-export function identify(index: string): string {
-  assert(!index.includes('\n'));
-  assert(index === index.trim());
-  return index
-    ? `index:${index.replace(/\s+/g, '_').slice(0, 101).replace(/^(.{97}).{4}$/, '$1...')}`
-    : '';
-}
-assert(identify('0'.repeat(100)).slice(6) === '0'.repeat(100));
-assert(identify('0'.repeat(101)).slice(6) === '0'.repeat(97) + '...');
-assert(identify('0'.repeat(200)).slice(6) === '0'.repeat(97) + '...');

package/src/parser/inline/extension/placeholder.test.ts

@@ -20,8 +20,6 @@ describe('Unit: parser/inline/extension/placeholder', () => {
       assert.deepStrictEqual(inspect(parser('[^\n]')), undefined);
       assert.deepStrictEqual(inspect(parser('[^\na]')), undefined);
       assert.deepStrictEqual(inspect(parser('[^\\\na]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[^[# a #]]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[^[# a #]b]')), undefined);
       assert.deepStrictEqual(inspect(parser('[^ !http://host]')), undefined);
       assert.deepStrictEqual(inspect(parser('[^a')), undefined);
       assert.deepStrictEqual(inspect(parser('[^a\n]')), undefined);
@@ -41,17 +39,19 @@ describe('Unit: parser/inline/extension/placeholder', () => {
     it('valid', () => {
       assert.deepStrictEqual(inspect(parser('[^a]')), [['<span class="invalid">a</span>'], '']);
       assert.deepStrictEqual(inspect(parser('[^a b]')), [['<span class="invalid">a b</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('[^\\]]')), [['<span class="invalid">]</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('[^(])]')), [['<span class="invalid"><span class="paren">(])</span></span>'], '']);
-      assert.deepStrictEqual(inspect(parser('[^!http://host]')), [['<span class="invalid"><a href="http://host" target="_blank"><img class="media" data-src="http://host" alt=""></a></span>'], '']);
       assert.deepStrictEqual(inspect(parser('[^a ]')), [['<span class="invalid">a </span>'], '']);
       assert.deepStrictEqual(inspect(parser('[^a  ]')), [['<span class="invalid">a  </span>'], '']);
       assert.deepStrictEqual(inspect(parser('[^a\\ ]')), [['<span class="invalid">a </span>'], '']);
       assert.deepStrictEqual(inspect(parser('[^a\\ \\ ]')), [['<span class="invalid">a  </span>'], '']);
       assert.deepStrictEqual(inspect(parser('[^a<wbr>]')), [['<span class="invalid">a<wbr></span>'], '']);
       assert.deepStrictEqual(inspect(parser('[^a<wbr><wbr>]')), [['<span class="invalid">a<wbr><wbr></span>'], '']);
-      assert.deepStrictEqual(inspect(parser('[^a[# b #]]')), [['<span class="invalid">a<sup class="comment" title="b"></sup></span>'], '']);
-      assert.deepStrictEqual(inspect(parser('[^a[# b #][# c #]]')), [['<span class="invalid">a<sup class="comment" title="b"></sup><sup class="comment" title="c"></sup></span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[^a[# b #]]')), [['<span class="invalid">a<span class="comment">[# b #]</span></span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[^a[# b #][# c #]]')), [['<span class="invalid">a<span class="comment">[# b #]</span><span class="comment">[# c #]</span></span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[^\\]]')), [['<span class="invalid">]</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[^(])]')), [['<span class="invalid"><span class="paren">(])</span></span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[^!http://host]')), [['<span class="invalid"><a href="http://host" target="_blank"><img class="media" data-src="http://host" alt=""></a></span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[^[# a #]]')), [['<span class="invalid"><span class="comment">[# a #]</span></span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[^[# a #]b]')), [['<span class="invalid"><span class="comment">[# a #]</span>b</span>'], '']);
     });
 
   });

package/src/parser/inline/insertion.test.ts

@@ -17,7 +17,7 @@ describe('Unit: parser/inline/insertion', () => {
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('++a++')), [['<ins>a</ins>'], '']);
-      assert.deepStrictEqual(inspect(parser('++ab++')), [['<ins>ab</ins>'], '']);
+      assert.deepStrictEqual(inspect(parser('++a+b++')), [['<ins>a+b</ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++a ++')), [['<ins>a </ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++ ++')), [['<ins> </ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++ a++')), [['<ins> a</ins>'], '']);
@@ -26,7 +26,6 @@ describe('Unit: parser/inline/insertion', () => {
       assert.deepStrictEqual(inspect(parser('++\na++')), [['<ins><br>a</ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++\\\na++')), [['<ins><span class="linebreak"> </span>a</ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++<wbr>a++')), [['<ins><wbr>a</ins>'], '']);
-      assert.deepStrictEqual(inspect(parser('++[# a #]b++')), [['<ins><sup class="comment" title="a"></sup>b</ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++a\n++')), [['<ins>a</ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++a\nb++')), [['<ins>a<br>b</ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++a\\\nb++')), [['<ins>a<span class="linebreak"> </span>b</ins>'], '']);

package/src/parser/inline/link.test.ts

@@ -72,7 +72,6 @@ describe('Unit: parser/inline/link', () => {
       assert.deepStrictEqual(inspect(parser('[a\nb]{b}')), undefined);
       assert.deepStrictEqual(inspect(parser('[a\\\nb]{b}')), undefined);
       assert.deepStrictEqual(inspect(parser('[<wbr>]{b}')), undefined);
-      assert.deepStrictEqual(inspect(parser('[[# a #]]{b}')), undefined);
       assert.deepStrictEqual(inspect(parser('[*a\nb*]{/}')), undefined);
       assert.deepStrictEqual(inspect(parser('[http://host]{http://host}')), undefined);
       assert.deepStrictEqual(inspect(parser('[]{ttp://host}')), [['<a class="invalid">ttp://host</a>'], '']);