securemark 0.231.0 → 0.232.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.231.0",
+  "version": "0.232.0",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@types/dompurify": "2.3.3",
-    "@types/jquery": "3.5.13",
+    "@types/jquery": "3.5.14",
     "@types/mathjax": "0.0.37",
     "@types/mocha": "9.1.0",
     "@types/power-assert": "1.5.8",
@@ -40,15 +40,17 @@
     "browserify-shim": "^3.8.14",
     "concurrently": "^7.0.0",
     "del": "^6.0.0",
+    "eslint-plugin-redos": "^4.3.0",
     "gulp": "^4.0.2",
     "gulp-derequire": "^3.0.0",
+    "gulp-eslint": "^6.0.0",
     "gulp-footer": "^2.1.0",
     "gulp-header": "^2.0.9",
     "gulp-load-plugins": "^2.0.7",
     "gulp-mocha": "^8.0.0",
     "gulp-rename": "^2.0.0",
     "gulp-unassert": "^2.0.0",
-    "karma": "^6.3.16",
+    "karma": "^6.3.17",
     "karma-chrome-launcher": "^3.1.0",
     "karma-coverage-istanbul-instrumenter": "^1.0.4",
     "karma-coverage-istanbul-reporter": "^3.0.3",
@@ -56,13 +58,13 @@
     "karma-firefox-launcher": "^2.1.2",
     "karma-mocha": "^2.0.1",
     "mocha": "^9.2.1",
-    "npm-check-updates": "^12.4.0",
+    "npm-check-updates": "^12.5.2",
     "power-assert": "^1.6.1",
     "semver": "^7.3.5",
-    "spica": "0.0.510",
+    "spica": "0.0.511",
     "tsify": "^5.0.4",
-    "typed-dom": "0.0.248",
-    "typescript": "4.5.5",
+    "typed-dom": "0.0.249",
+    "typescript": "4.6.2",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0"
   },

package/src/debug.test.ts

@@ -21,6 +21,7 @@ export function inspect(result: Result<HTMLElement | string>, until: number | st
       el.innerHTML = node.outerHTML.slice(0, until);
       if (node.outerHTML.length <= until) {
         assert(node.outerHTML === el.innerHTML);
+        // eslint-disable-next-line redos/no-vulnerable
         assert(node.childNodes.length === el.firstChild?.childNodes.length || />[^<]{65537}/.test(node.outerHTML));
       }
       else {

package/src/parser/api/header.ts

@@ -8,7 +8,7 @@ export function header(source: string): string {
 
 export function headers(source: string): string[] {
   const [el] = parse(source);
-  return el?.textContent!.trimEnd().slice(el.firstChild!.textContent!.length).split(/[^\S\n]*\n/) ?? [];
+  return el?.textContent!.trimEnd().slice(el.firstChild!.textContent!.length).split('\n') ?? [];
 }
 
 function parse(source: string): [HTMLDetailsElement, string] | [] {

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

@@ -127,7 +127,7 @@ function attributes(source: string) {
       ? { 'data-highlight-level': +highlight! > 1 ? highlight : undefined }
       : {
           'data-invalid-syntax': 'table',
-          'data-invalid-type': 'highlight',
+          'data-invalid-type': 'syntax',
           'data-invalid-description': 'Too much highlight level.',
         },
   };

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

@@ -28,28 +28,20 @@ describe('Unit: parser/block/paragraph', () => {
       assert.deepStrictEqual(inspect(parser(' a')), [['<p>a</p>'], '']);
     });
 
-    it('mention', () => {
-      assert.deepStrictEqual(inspect(parser('>>1')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\na')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br>a</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\na\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br>a<br><a href="?comment=2" class="anchor">&gt;&gt;2</a></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="cite">&gt;<a href="?comment=2" class="anchor" data-depth="1">&gt;2</a></span></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\n> a')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\n> a\nb')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br>b</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\n> a\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br><span class="cite">&gt;<a href="?comment=2" class="anchor" data-depth="1">&gt;2</a></span></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\n> a\n>> b')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a<br>&gt;&gt; b</span></p>'], '']);
+    it('anchor', () => {
       assert.deepStrictEqual(inspect(parser('>>1 a\nb')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a> a<br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>1 a\n>>2')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a> a<br><a href="?comment=2" class="anchor">&gt;&gt;2</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>1 a\n>>b')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a> a<br><a href="?comment=b" class="anchor">&gt;&gt;b</a></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1 a\n>> b')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a> a<br><span class="quote">&gt;&gt; b</span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1 a\n>> b')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a> a<br>&gt;&gt; b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>11.')), [['<p><a href="?comment=11" class="anchor">&gt;&gt;11</a>.</p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>11 a')), [['<p><a href="?comment=11" class="anchor">&gt;&gt;11</a> a</p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>>11 a')), [['<p>&gt;<a href="?comment=11" class="anchor">&gt;&gt;11</a> a</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>> a\n>>1')), [['<p><span class="quote">&gt;&gt; a</span><br><a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>> a\n>>1')), [['<p>&gt;&gt; a<br><a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('a>>1')), [['<p>a<a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('a >>1')), [['<p>a <a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\n>>1')), [['<p>a<br><a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\n>>1\nb')), [['<p>a<br><a href="?comment=1" class="anchor">&gt;&gt;1</a><br>b</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('a\n>> b\nc')), [['<p>a<br><span class="quote">&gt;&gt; b</span><br>c</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('a\n>> b\nc')), [['<p>a<br>&gt;&gt; b<br>c</p>'], '']);
       assert.deepStrictEqual(inspect(parser(' >>1')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser(' >>>1')), [['<p>&gt;<a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
     });

package/src/parser/block/paragraph.ts

@@ -1,24 +1,10 @@
 import { ParagraphParser } from '../block';
-import { union, subsequence, some, block, rewrite, trim, fmap } from '../../combinator';
-import { mention } from './paragraph/mention';
-import { quote, syntax as delimiter } from './paragraph/mention/quote';
+import { union, some, block, trim, fmap } from '../../combinator';
 import { inline } from '../inline';
-import { anyline } from '../source';
 import { localize } from '../locale';
 import { visualize } from '../util';
 import { html, defrag } from 'typed-dom';
-import { push, pop } from 'spica/array';
 
 export const paragraph: ParagraphParser = block(localize(fmap(
-  subsequence([
-    some(mention),
-    some(union([
-      quote,
-      fmap(
-        rewrite(
-          some(anyline, delimiter),
-          trim(visualize(some(inline)))),
-        ns => push(ns, [html('br')])),
-    ])),
-  ]),
-  ns => [html('p', defrag(pop(ns)[0]))])));
+  trim(visualize(some(union([inline])))),
+  ns => [html('p', defrag(ns))])));

package/src/parser/block/{paragraph/mention → reply}/cite.test.ts

@@ -1,8 +1,8 @@
 import { cite } from './cite';
-import { some } from '../../../../combinator';
-import { inspect } from '../../../../debug.test';
+import { some } from '../../../combinator';
+import { inspect } from '../../../debug.test';
 
-describe('Unit: parser/block/paragraph/mention/cite', () => {
+describe('Unit: parser/block/reply/cite', () => {
   describe('cite', () => {
     const parser = (source: string) => some(cite)(source, {});
 

package/src/parser/block/{paragraph/mention → reply}/cite.ts

@@ -1,10 +1,10 @@
-import { ParagraphParser } from '../../../block';
-import { tails, line, validate, creator, reverse, fmap } from '../../../../combinator';
-import { anchor } from '../../../inline/autolink/anchor';
-import { str } from '../../../source';
+import { ReplyParser } from '../../block';
+import { tails, line, validate, creator, reverse, fmap } from '../../../combinator';
+import { anchor } from '../../inline/autolink/anchor';
+import { str } from '../../source';
 import { html, define, defrag } from 'typed-dom';
 
-export const cite: ParagraphParser.MentionParser.CiteParser = creator(line(fmap(validate(
+export const cite: ReplyParser.CiteParser = creator(line(fmap(validate(
   '>>',
   reverse(tails([
     str(/^>*(?=>>)/),

package/src/parser/block/{paragraph/mention → reply}/quote.test.ts

@@ -1,8 +1,8 @@
 import { quote } from './quote';
-import { some } from '../../../../combinator';
-import { inspect } from '../../../../debug.test';
+import { some } from '../../../combinator';
+import { inspect } from '../../../debug.test';
 
-describe('Unit: parser/block/paragraph/mention/quote', () => {
+describe('Unit: parser/block/reply/quote', () => {
   describe('quote', () => {
     const parser = (source: string) => some(quote)(source, {});
 

package/src/parser/block/{paragraph/mention → reply}/quote.ts

@@ -1,14 +1,14 @@
-import { ParagraphParser } from '../../../block';
-import { eval } from '../../../../combinator/data/parser';
-import { union, some, block, line, validate, rewrite, creator, lazy, fmap } from '../../../../combinator';
-import { math } from '../../../inline/math';
-import { str, anyline } from '../../../source';
-import { autolink } from '../../../autolink';
+import { ReplyParser } from '../../block';
+import { eval } from '../../../combinator/data/parser';
+import { union, some, block, line, validate, rewrite, creator, lazy, fmap } from '../../../combinator';
+import { math } from '../../inline/math';
+import { str, anyline } from '../../source';
+import { autolink } from '../../autolink';
 import { html, defrag } from 'typed-dom';
 
 export const syntax = /^>+(?=[^\S\n])|^>(?=[^\s>])|^>+(?=[^\s>])(?![0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:]))/;
 
-export const quote: ParagraphParser.MentionParser.QuoteParser = lazy(() => creator(block(fmap(validate(
+export const quote: ReplyParser.QuoteParser = lazy(() => creator(block(fmap(validate(
   '>',
   union([
     rewrite(
@@ -33,7 +33,7 @@ export const quote: ParagraphParser.MentionParser.QuoteParser = lazy(() => creat
   ]),
   false)));
 
-const qblock: ParagraphParser.MentionParser.QuoteParser.BlockParser = (source, context) => {
+const qblock: ReplyParser.QuoteParser.BlockParser = (source, context) => {
   source = source.replace(/\n$/, '');
   const lines = source.match(/^.*\n?/mg)!;
   assert(lines);
@@ -69,7 +69,7 @@ const qblock: ParagraphParser.MentionParser.QuoteParser.BlockParser = (source, c
   return [defrag(nodes), ''];
 };
 
-const text: ParagraphParser.MentionParser.QuoteParser.TextParser = union([
+const text: ReplyParser.QuoteParser.TextParser = union([
   math,
   autolink,
 ]);

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

@@ -0,0 +1,22 @@
+import { reply } from './reply';
+import { some } from '../../combinator';
+import { inspect } from '../../debug.test';
+
+describe('Unit: parser/block/reply', () => {
+  describe('reply', () => {
+    const parser = (source: string) => some(reply)(source, {});
+
+    it('basic', () => {
+      assert.deepStrictEqual(inspect(parser('>>1')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\na')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br>a</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\na\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br>a<br><a href="?comment=2" class="anchor">&gt;&gt;2</a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="cite">&gt;<a href="?comment=2" class="anchor" data-depth="1">&gt;2</a></span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\n> a')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\n> a\nb')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\n> a\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br><span class="cite">&gt;<a href="?comment=2" class="anchor" data-depth="1">&gt;2</a></span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\n> a\n>> b')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a<br>&gt;&gt; b</span></p>'], '']);
+    });
+
+  });
+
+});

package/src/parser/block/reply.ts

@@ -0,0 +1,27 @@
+import { ReplyParser } from '../block';
+import { inits, subsequence, some, block, validate, rewrite, trim, fmap } from '../../combinator';
+import { cite } from './reply/cite';
+import { quote, syntax as delimiter } from './reply/quote';
+import { inline } from '../inline';
+import { anyline } from '../source';
+import { localize } from '../locale';
+import { visualize } from '../util';
+import { html, defrag } from 'typed-dom';
+import { push, pop } from 'spica/array';
+
+export const reply: ReplyParser = block(validate('>', localize(fmap(
+  some(inits([
+    some(inits([
+      cite,
+      quote,
+    ])),
+    subsequence([
+      some(quote),
+      fmap(
+        rewrite(
+          some(anyline, delimiter),
+          trim(visualize(some(inline)))),
+        ns => push(ns, [html('br')])),
+    ]),
+  ])),
+  ns => [html('p', defrag(pop(ns)[0]))]))));

package/src/parser/block.ts

@@ -13,6 +13,7 @@ import { blockquote } from './block/blockquote';
 import { codeblock } from './block/codeblock';
 import { mathblock } from './block/mathblock';
 import { extension } from './block/extension';
+import { reply } from './block/reply';
 import { paragraph } from './block/paragraph';
 import { html } from 'typed-dom';
 import { rnd0Z } from 'spica/random';
@@ -29,6 +30,7 @@ export import CodeBlockParser = BlockParser.CodeBlockParser;
 export import MathBlockParser = BlockParser.MathBlockParser;
 export import ExtensionParser = BlockParser.ExtensionParser;
 export import BlockquoteParser = BlockParser.BlockquoteParser;
+export import ReplyParser = BlockParser.ReplyParser;
 export import ParagraphParser = BlockParser.ParagraphParser;
 
 export const block: BlockParser = creator(error(
@@ -46,6 +48,7 @@ export const block: BlockParser = creator(error(
     mathblock,
     extension,
     blockquote,
+    reply,
     paragraph
   ]))));
 

package/src/parser/inline/bracket.ts

@@ -6,11 +6,8 @@ import { str } from '../source';
 import { html, defrag } from 'typed-dom';
 import { unshift, push } from 'spica/array';
 
-const index = new RegExp(`^(?:${[
-  /(?:0|[1-9]\d*)(?:\.(?:0|[1-9]\d*))+/,
-  /[0-9]{1,4}|[A-Za-z]/,
-].map(r => r.source).join('|')})`);
-const indexFW = new RegExp(index.source.replace(/[019AZaz](?!,)/g, c => String.fromCharCode(c.charCodeAt(0) + 0xfee0)));
+const index = /^(?:[0-9]+(?:\.[0-9]+)*|[A-Za-z])/;
+const indexFW = new RegExp(index.source.replace(/[019AZaz](?!,)/g, c => String.fromCharCode(c.charCodeAt(0) + 0xFEE0)));
 
 export const bracket: BracketParser = lazy(() => union([
   surround(str('('), str(index), str(')'), false,

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

@@ -17,8 +17,10 @@ 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('[# [# 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']);

package/src/parser/inline/comment.ts

@@ -6,9 +6,9 @@ import { unescsource } from '../source';
 import { html } from 'typed-dom';
 
 export const comment: CommentParser = creator(validate('[#', match(
-  /^\[(#+)\s+(?!\s|\1\]|\[\1\s)((?:\S+\s+)+?)(\1\]|(?=\[\1(?:$|\s)))/,
+  /^\[(#+)(?!\S|\s+\1\]|\s*\[\1(?:$|\s))((?:\s+\S+)+?)(?:\s+(\1\])|\s*(?=\[\1(?:$|\s)))/,
   ([whole, , body, closer]) => (rest, context) => {
-    [whole, body] = `${whole}\0${body.trimEnd()}`.replace(/\x1B/g, '').split('\0', 2);
+    [whole, body] = `${whole}\0${body.trimStart()}`.replace(/\x1B/g, '').split('\0', 2);
     if (!closer) return [[html('sup', {
       class: 'comment invalid',
       'data-invalid-syntax': 'comment',

package/src/parser/inline/html.ts

@@ -88,7 +88,7 @@ export const html: HTMLParser = lazy(() => creator(validate('<', validate(/^<[a-
 ])))));
 
 export const attribute: HTMLParser.TagParser.AttributeParser = union([
-  str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\n"])*")?(?=[^\S\n]|>)/),
+  str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|>)/),
 ]);
 
 function elem(tag: string, as: (HTMLElement | string)[], bs: (HTMLElement | string)[], cs: (HTMLElement | string)[], context: MarkdownParser.Context): HTMLElement {

package/src/parser/inline/link.ts

@@ -52,7 +52,7 @@ export const link: LinkParser = lazy(() => creator(10, bind(reverse(
     const INSECURE_URI = params.shift()!;
     assert(INSECURE_URI === INSECURE_URI.trim());
     assert(!INSECURE_URI.match(/\s/));
-    const el = create(
+    const el = elem(
       INSECURE_URI,
       trimNode(defrag(content)),
       new ReadonlyURL(
@@ -71,7 +71,7 @@ export const uri: LinkParser.ParameterParser.UriParser = union([
 
 export const option: LinkParser.ParameterParser.OptionParser = union([
   fmap(str(/^[^\S\n]+nofollow(?=[^\S\n]|})/), () => [` rel="nofollow"`]),
-  str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\n"])*")?(?=[^\S\n]|})/),
+  str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|})/),
   fmap(str(/^[^\S\n]+(?=})/), () => []),
   fmap(str(/^[^\S\n]+[^\n{}]+/), opt => [` \\${opt.slice(1)}`]),
 ]);
@@ -98,7 +98,7 @@ export function resolve(uri: string, host: URL | Location, source: URL | Locatio
   }
 }
 
-function create(
+function elem(
   INSECURE_URI: string,
   content: readonly (string | HTMLElement)[],
   uri: ReadonlyURL,

package/src/parser/inline/ruby.ts

@@ -11,8 +11,8 @@ import { unshift, push, join } from 'spica/array';
 export const ruby: RubyParser = lazy(() => creator(bind(verify(
   validate('[', ')', '\n',
   sequence([
-    surround('[', focus(/^(?:\\[^\n]|[^\[\]\n])+(?=]\()/, text), ']'),
-    surround('(', focus(/^(?:\\[^\n]|[^\(\)\n])+(?=\))/, text), ')'),
+    surround('[', focus(/^(?:\\[^\n]|[^\\\[\]\n])+(?=]\()/, text), ']'),
+    surround('(', focus(/^(?:\\[^\n]|[^\\\(\)\n])+(?=\))/, text), ')'),
   ])),
   ([texts]) => isStartTightNodes(texts)),
   ([texts, rubies], rest) => {

package/src/parser/util.ts

@@ -42,13 +42,13 @@ const invisibleHTMLEntityNames = [
   'InvisibleComma',
   'ic',
 ];
-const blankline = new RegExp(String.raw`^(?!$|\n)(?:\\?\s|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>|\[(#+)\s+(?!\s|\1\]|\[\1\s)(?:\S+\s+)+?(?:\1\]|(?=\[\1(?:$|\s))))*\\?(?:$|\n)`, 'gm');
+const blankline = new RegExp(String.raw`^(?!$)(?:\\$|\\?[^\S\n]|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>|\[(#+)(?!\S|\s+\1\]|\s*\[\1(?:$|\s))((?:\s+\S+)+?)(?:\s+(\1\])|\s*(?=\[\1(?:$|\s))))+(?=$|(\S))`, 'gm');
 
 export function visualize<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
   return union([
     convert(
-      source => source.replace(blankline, line => line.replace(/[\\&<\[]/g, '\x1B$&')),
+      source => source.replace(blankline, (line, ...$) => !$[3] ? line.replace(/[\\&<\[]/g, '\x1B$&') : line),
       verify(parser, (ns, rest, context) => !rest && hasVisible(ns, context))),
     some(union([linebreak, unescsource])),
   ]);
@@ -229,7 +229,7 @@ export function stringify(nodes: readonly (HTMLElement | string)[]): string {
     }
     else {
       assert(!node.matches('br') && !node.querySelector('br'));
-      // Note: Doesn't reflect line breaks.
+      // NOTE: Doesn't reflect line breaks.
       acc += node.innerText;
     }
   }

package/src/renderer/render/media/youtube.ts

@@ -15,12 +15,12 @@ export function youtube(source: HTMLImageElement, url: URL): HTMLElement | undef
 function resolve(url: URL): string | undefined {
   switch (url.origin) {
     case 'https://www.youtube.com':
-      return url.pathname === '/watch/'
-        ? url.href.replace(/.+?=/, '').replace('&', '?')
+      return url.pathname.match(/^\/watch\/?$/)
+        ? url.searchParams.get('v')?.concat(url.search.replace(/([?&])v=[^&#]*&?/g, '$1'), url.hash)
         : undefined;
     case 'https://youtu.be':
-      return url.pathname.match(/^\/[\w-]+$/)
-        ? url.href.slice(url.href.indexOf('/', 9) + 1)
+      return url.pathname.match(/^\/[\w-]+\/?$/)
+        ? url.href.slice(url.origin.length)
         : undefined;
     default:
       return;

package/src/util/info.test.ts

@@ -14,7 +14,7 @@ describe('Unit: util/info', () => {
           channel: [],
           hashtag: [],
           hashnum: [],
-          mention: [],
+          reply: [],
           anchor: [],
           media: [],
         });

package/src/util/info.ts

@@ -2,7 +2,7 @@ import { Info } from '../..';
 import { scope } from './scope';
 
 export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info {
-  const match = scope(source, 'section, article, aside, blockquote, .quote, pre, .math, .media');
+  const match = scope(source, '.invalid');
   return {
     url: find<HTMLAnchorElement>('a:not(.email):not(.account):not(.channel):not(.hashtag):not(.hashnum):not(.anchor)')
       .filter(el => ['http:', 'https:'].includes(el.protocol)),
@@ -13,7 +13,7 @@ export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info
     channel: find('a.channel'),
     hashtag: find('a.hashtag'),
     hashnum: find('a.hashnum'),
-    mention: find('.cite > a.anchor'),
+    reply: find('.cite > a.anchor'),
     anchor: find(':not(.cite) > a.anchor'),
     media: find('.media[data-src]'),
   };

package/src/util/quote.ts

@@ -1,5 +1,5 @@
 import { exec } from '../combinator/data/parser';
-import { cite } from '../parser/block/paragraph/mention/cite';
+import { cite } from '../parser/block/reply/cite';
 import { define } from 'typed-dom';
 
 export function quote(anchor: string, range: Range): string {

package/src/util/scope.ts

@@ -2,8 +2,10 @@ import { undefined, WeakMap } from 'spica/global';
 
 export function scope(
   base: DocumentFragment | HTMLElement | ShadowRoot,
-  bound: string = `${'id' in base && base.id ? `#${base.id}, ` : ''}section, article, aside, blockquote`,
+  filter: string = '',
+  bound: string = `${'id' in base && base.id ? `#${base.id}, ` : ''}section, article, aside, blockquote, pre, .quote, .math, .media`,
 ): (el: Element) => boolean {
+  bound += filter && `, ${filter}`;
   const memory = new WeakMap<Node, boolean>();
   const context = 'id' in base && base.closest(bound) || null;
   return el => {

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

@@ -1,9 +0,0 @@
-import { ParagraphParser } from '../../block';
-import { inits, some, validate } from '../../../combinator';
-import { cite } from './mention/cite';
-import { quote } from './mention/quote';
-
-export const mention: ParagraphParser.MentionParser = validate('>', inits([
-  some(cite),
-  quote,
-]));