securemark 0.283.3 → 0.283.5

package/src/parser/inline/autolink/anchor.ts

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
-import { union, constraint, validate, focus, convert, fmap, lazy } from '../../../combinator';
-import { unsafelink } from '../link';
 import { State } from '../../context';
+import { union, syntax, constraint, validate, focus, convert, fmap, lazy } from '../../../combinator';
+import { unsafelink } from '../link';
 import { define } from 'typed-dom/dom';
 
 // Timeline(pseudonym): user/tid
@@ -14,16 +14,17 @@ import { define } from 'typed-dom/dom';
 // 内部表現はUnixTimeに統一する(時系列順)
 // 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
 
-export const anchor: AutolinkParser.AnchorParser = lazy(() => validate('>>', fmap(
-  constraint(State.shortcut, false,
+export const anchor: AutolinkParser.AnchorParser = lazy(() => validate('>>',
   focus(
     /^>>(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9a-z@#:])/i,
-    convert(
-      source =>
-        `[${source}]{ ${
-        source.includes('/')
-          ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
-          : `?at=${source.slice(2)}`
-        } }`,
-      union([unsafelink])))),
-  ([el]) => [define(el, { class: 'anchor' })])));
+    union([
+      constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+        source =>
+          `[${source}]{ ${source.includes('/')
+            ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
+            : `?at=${source.slice(2)}`
+          } }`,
+        unsafelink),
+        ([el]) => [define(el, { class: 'anchor' })]))),
+      ({ source }) => [[source], ''],
+    ]))));

package/src/parser/inline/autolink/channel.ts

@@ -1,5 +1,6 @@
 import { AutolinkParser } from '../../inline';
-import { sequence, some, validate, bind } from '../../../combinator';
+import { State } from '../../context';
+import { sequence, some, constraint, validate, bind } from '../../../combinator';
 import { account } from './account';
 import { hashtag } from './hashtag';
 import { stringify } from '../../util';
@@ -7,7 +8,8 @@ import { define } from 'typed-dom/dom';
 
 // https://example/@user?ch=a+b must be a user channel page or a redirect page going there.
 
-export const channel: AutolinkParser.ChannelParser = validate('@', bind(
+export const channel: AutolinkParser.ChannelParser = validate('@',
+  constraint(State.autolink, false, bind(
   sequence([
     account,
     some(hashtag),
@@ -15,6 +17,7 @@ export const channel: AutolinkParser.ChannelParser = validate('@', bind(
   (es, rest) => {
     const source = stringify(es);
     const el = es[0];
+    if (typeof el === 'string') return [es, rest];
     const url = `${el.getAttribute('href')}?ch=${source.slice(source.indexOf('#') + 1).replace(/#/g, '+')}`;
     return [[define(el, { class: 'channel', href: url }, source)], rest];
-  }));
+  })));

package/src/parser/inline/autolink/email.ts

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
-import { creation, verify, rewrite } from '../../../combinator';
+import { State, Recursion } from '../../context';
+import { syntax, creation, constraint, verify, rewrite } from '../../../combinator';
 import { str } from '../../source';
-import { Recursion } from '../../context';
 import { html } from 'typed-dom/dom';
 
 // https://html.spec.whatwg.org/multipage/input.html
@@ -9,4 +9,5 @@ import { html } from 'typed-dom/dom';
 export const email: AutolinkParser.EmailParser = creation(1, Recursion.ignore, rewrite(verify(
   str(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z])/i),
   ([source]) => source.length <= 255),
-  ({ source }) => [[html('a', { class: 'email', href: `mailto:${source}` }, source)], '']));
+  constraint(State.autolink, false, syntax(0, State.autolink,
+    ({ source }) => [[html('a', { class: 'email', href: `mailto:${source}` }, source)], '']))));

package/src/parser/inline/autolink/hashnum.ts

@@ -1,15 +1,17 @@
 import { AutolinkParser } from '../../inline';
-import { union, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { State } from '../../context';
+import { union, syntax, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { emoji } from './hashtag';
 import { str } from '../../source';
-import { State } from '../../context';
 import { define } from 'typed-dom/dom';
 
-export const hashnum: AutolinkParser.HashnumParser = lazy(() => fmap(rewrite(
-  constraint(State.shortcut, false,
-  open('#', str(new RegExp(/^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji|['_])/u.source.replace(/emoji/, emoji), 'u')))),
-  convert(
-    source => `[${source}]{ ${source.slice(1)} }`,
-    union([unsafelink]))),
-  ([el]) => [define(el, { class: 'hashnum', href: null })]));
+export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
+  open('#', str(new RegExp(/^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji|['_])/u.source.replace(/emoji/, emoji), 'u'))),
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+      source => `[${source}]{ ${source.slice(1)} }`,
+      unsafelink),
+      ([el]) => [define(el, { class: 'hashnum', href: null })]))),
+    ({ source }) => [[source], ''],
+  ])));

package/src/parser/inline/autolink/hashtag.ts

@@ -1,8 +1,8 @@
 import { AutolinkParser } from '../../inline';
-import { union, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { State } from '../../context';
+import { union, syntax, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
-import { State } from '../../context';
 import { define } from 'typed-dom/dom';
 
 // https://example/hashtags/a must be a hashtag page or a redirect page going there.
@@ -10,15 +10,17 @@ import { define } from 'typed-dom/dom';
 // https://github.com/tc39/proposal-regexp-unicode-property-escapes#matching-emoji
 export const emoji = String.raw`\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F`;
 
-export const hashtag: AutolinkParser.HashtagParser = lazy(() => fmap(rewrite(
-  constraint(State.shortcut, false,
+export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
   open(
     '#',
     str(new RegExp([
       /^(?!['_])(?=(?:[0-9]{1,9})?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'|_(?=[^\p{C}\p{S}\p{P}\s]|emoji|')))/u.source,
       /(?:[^\p{C}\p{S}\p{P}\s]|emoji|'|_(?=[^\p{C}\p{S}\p{P}\s]|emoji|'))+/u.source,
-    ].join('').replace(/emoji/g, emoji), 'u')))),
-  convert(
-    source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
-    union([unsafelink]))),
-  ([el]) => [define(el, { class: 'hashtag' })]));
+    ].join('').replace(/emoji/g, emoji), 'u'))),
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+      source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
+      unsafelink),
+      ([el]) => [define(el, { class: 'hashtag' })]))),
+    ({ source }) => [[source], ''],
+  ])));

package/src/parser/inline/autolink/url.ts

@@ -1,8 +1,8 @@
 import { AutolinkParser } from '../../inline';
-import { union, tails, some, creation, precedence, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
+import { State, Recursion, Backtrack } from '../../context';
+import { union, tails, some, syntax, creation, precedence, constraint, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { linebreak, unescsource, str } from '../../source';
-import { Backtrack, Recursion } from '../../context';
 
 const closer = /^[-+*=~^_,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
 
@@ -10,24 +10,30 @@ export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'ht
   open(
     /^https?:\/\/(?=[\x21-\x7E])/,
     focus(/^[\x21-\x7E]+/, some(union([bracket, some(unescsource, closer)])))),
-  convert(
-    url => `{ ${url} }`,
-    union([unsafelink])))));
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, convert(
+      url => `{ ${url} }`,
+      unsafelink))),
+    ({ source }) => [[source], ''],
+  ]))));
 
 export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => open(
   linebreak,
-  tails([
-    str('!'),
-    focus(
-      /^https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
-      convert(
-        url => `{ ${url} }`,
-        unsafelink)),
-  ])));
+  focus(
+    /^!?https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
+    tails([
+      str('!'),
+      union([
+        constraint(State.autolink, false, syntax(0, State.autolink, convert(
+          url => `{ ${url} }`,
+          unsafelink))),
+        ({ source }) => [[source], ''],
+      ]),
+    ]))));
 
-const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creation(0, Recursion.terminal, precedence(1, union([
-  surround(str('('), some(union([bracket, unescsource]), ')'), str(')'), true, undefined, undefined, 3 | Backtrack.url),
-  surround(str('['), some(union([bracket, unescsource]), ']'), str(']'), true, undefined, undefined, 3 | Backtrack.url),
-  surround(str('{'), some(union([bracket, unescsource]), '}'), str('}'), true, undefined, undefined, 3 | Backtrack.url),
+const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creation(0, Recursion.terminal, union([
+  surround(str('('), precedence(1, some(union([bracket, unescsource]), ')')), str(')'), true, undefined, undefined, 3 | Backtrack.url),
+  surround(str('['), precedence(1, some(union([bracket, unescsource]), ']')), str(']'), true, undefined, undefined, 3 | Backtrack.url),
+  surround(str('{'), precedence(1, some(union([bracket, unescsource]), '}')), str('}'), true, undefined, undefined, 3 | Backtrack.url),
   surround(str('"'), precedence(2, some(unescsource, '"')), str('"'), true, undefined, undefined, 3 | Backtrack.url),
-]))));
+])));

package/src/parser/inline/autolink.ts

@@ -1,5 +1,6 @@
 import { AutolinkParser } from '../inline';
-import { union, some, syntax, constraint, validate, lazy, fmap } from '../../combinator';
+import { State } from '../context';
+import { union, some, syntax, validate, lazy, fmap } from '../../combinator';
 import { url, lineurl } from './autolink/url';
 import { email } from './autolink/email';
 import { channel } from './autolink/channel';
@@ -8,13 +9,11 @@ import { hashtag, emoji } from './autolink/hashtag';
 import { hashnum } from './autolink/hashnum';
 import { anchor } from './autolink/anchor';
 import { str } from '../source';
-import { State } from '../context';
 import { stringify } from '../util';
 
 export const autolink: AutolinkParser = lazy(() =>
   validate(/^(?:[@#>0-9a-z]|\S[#>]|[\r\n]!?https?:\/\/)/iu,
-  constraint(State.autolink, false,
-  syntax(0, ~State.shortcut,
+  syntax(0, ~State.autolink,
   union([
     some(union([lineurl])),
     fmap(some(union([
@@ -37,4 +36,4 @@ export const autolink: AutolinkParser = lazy(() =>
       anchor,
     ])),
     ns => ns.length === 1 ? ns : [stringify(ns)]),
-  ])))));
+  ]))));

package/src/parser/inline/bracket.ts

@@ -1,8 +1,8 @@
 import { BracketParser } from '../inline';
+import { State, Recursion, Backtrack } from '../context';
 import { union, some, syntax, creation, surround, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { State, Recursion, Backtrack } from '../context';
 import { unshift, push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
@@ -32,19 +32,19 @@ export const bracket: BracketParser = lazy(() => union([
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
   // 改行禁止はバックトラックなしでは内側の構文を破壊するため安易に行えない。
-  surround(str('"'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '"', [[/^\\?\n/, 9], ['"', 2]]))), str('"'), true,
+  surround(str('"'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '"', [['\n', 9], ['"', 2]]))), str('"'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('“'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '”', [[/^\\?\n/, 9], ['”', 2]]))), str('”'), true,
+  surround(str('“'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '”', [['\n', 9], ['”', 2]]))), str('”'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('‘'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '’', [[/^\\?\n/, 9], ['’', 2]]))), str('’'), true,
+  surround(str('‘'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '’', [['\n', 9], ['’', 2]]))), str('’'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('「'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '」', [[/^\\?\n/, 9], ['」', 2]]))), str('」'), true,
+  surround(str('「'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '」', [['\n', 9], ['」', 2]]))), str('」'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('『'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '』', [[/^\\?\n/, 9], ['』', 2]]))), str('』'), true,
+  surround(str('『'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '』', [['\n', 9], ['』', 2]]))), str('』'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
 ]));

package/src/parser/inline/code.ts

@@ -1,6 +1,6 @@
 import { CodeParser } from '../inline';
-import { creation, validate, match } from '../../combinator';
 import { Recursion } from '../context';
+import { creation, validate, match } from '../../combinator';
 import { html } from 'typed-dom/dom';
 
 export const code: CodeParser = creation(1, Recursion.ignore, validate('`', match(

package/src/parser/inline/deletion.ts

@@ -1,8 +1,8 @@
 import { DeletionParser } from '../inline';
+import { State, Recursion } from '../context';
 import { union, some, syntax, creation, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { State, Recursion } from '../context';
 import { blankWith } from '../visibility';
 import { unshift } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';

package/src/parser/inline/emphasis.ts

@@ -1,10 +1,10 @@
 import { EmphasisParser } from '../inline';
+import { State, Recursion } from '../context';
 import { union, some, syntax, creation, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { emstrong } from './emstrong';
 import { strong } from './strong';
 import { str } from '../source';
-import { State, Recursion } from '../context';
 import { startTight, blankWith } from '../visibility';
 import { unshift } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';

package/src/parser/inline/emstrong.ts

@@ -1,11 +1,11 @@
 import { EmStrongParser, EmphasisParser, StrongParser } from '../inline';
+import { State, Recursion } from '../context';
 import { Result, IntermediateParser } from '../../combinator/data/parser';
 import { union, syntax, creation, some, surround, open, lazy, bind } from '../../combinator';
 import { inline } from '../inline';
 import { strong } from './strong';
 import { emphasis } from './emphasis';
 import { str } from '../source';
-import { State, Recursion } from '../context';
 import { startTight, blankWith } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';

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

@@ -1,10 +1,10 @@
 import { ExtensionParser } from '../../inline';
+import { State, Recursion, Backtrack } from '../../context';
 import { union, inits, some, syntax, creation, precedence, constraint, validate, surround, open, lazy, fmap } from '../../../combinator';
 import { inline } from '../../inline';
 import { indexee, identity } from './indexee';
 import { txt, str } from '../../source';
-import { State, Recursion, Backtrack } from '../../context';
-import { startTight, trimNodeEnd } from '../../visibility';
+import { startTight, trimBlankNodeEnd } from '../../visibility';
 import { html, define, defrag } from 'typed-dom/dom';
 
 import IndexParser = ExtensionParser.IndexParser;
@@ -17,10 +17,13 @@ export const index: IndexParser = lazy(() => validate('[#', creation(1, Recursio
   some(inits([
     inline,
     signature,
-  ]), ']', [[/^\\?\n/, 9], [']', 1]])))),
+  ]), ']', [['\n', 9], [']', 1]])))),
   ']',
   false,
-  ([, ns], rest) => [[html('a', { 'data-index': dataindex(ns) }, trimNodeEnd(defrag(ns)))], rest],
+  ([, ns], rest) =>
+    trimBlankNodeEnd(ns).length > 0
+      ? [[html('a', { 'data-index': dataindex(ns) }, defrag(ns))], rest]
+      : undefined,
   undefined, 1 | Backtrack.bracket)),
   ([el]: [HTMLAnchorElement]) => [
     define(el,
@@ -32,8 +35,8 @@ export const index: IndexParser = lazy(() => validate('[#', creation(1, Recursio
   ]))));
 
 export const signature: IndexParser.SignatureParser = lazy(() => validate('|', creation(1, Recursion.ignore, fmap(open(
-  '|',
-  startTight(some(union([bracket, txt]), ']'))),
+  /^\|(?!\\?\s)/,
+  some(union([bracket, txt]), ']')),
   ns => [
     html('span', { class: 'indexer', 'data-index': identity('index', undefined, ns.join(''))!.slice(7) }),
   ]))));

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

@@ -1,7 +1,7 @@
 import { ExtensionParser } from '../../inline';
+import { Recursion } from '../../context';
 import { union, creation, focus, surround } from '../../../combinator';
 import { signature } from './index';
-import { Recursion } from '../../context';
 import { html } from 'typed-dom/dom';
 
 export const indexer: ExtensionParser.IndexerParser = surround(

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

@@ -1,7 +1,7 @@
 import { ExtensionParser } from '../../inline';
+import { State, Recursion } from '../../context';
 import { union, constraint, creation, validate, surround, clear, fmap } from '../../../combinator';
 import { str } from '../../source';
-import { State, Recursion } from '../../context';
 import { html } from 'typed-dom/dom';
 
 const body = str(/^\$[A-Za-z]*(?:(?:-[A-Za-z][0-9A-Za-z]*)+|-(?:(?:0|[1-9][0-9]*)\.)*(?:0|[1-9][0-9]*)(?![0-9A-Za-z]))/);

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

@@ -1,8 +1,8 @@
 import { ExtensionParser } from '../../inline';
+import { State, Recursion, Backtrack } from '../../context';
 import { union, some, syntax, creation, validate, surround, lazy } from '../../../combinator';
 import { inline } from '../../inline';
 import { str } from '../../source';
-import { State, Recursion, Backtrack } from '../../context';
 import { startTight } from '../../visibility';
 import { unshift } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';

package/src/parser/inline/html.ts

@@ -1,8 +1,8 @@
 import { HTMLParser } from '../inline';
+import { State, Recursion } from '../context';
 import { union, subsequence, some, syntax, creation, validate, focus, surround, open, match, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { State, Recursion } from '../context';
 import { isStartLooseNodes, blankWith } from '../visibility';
 import { memoize } from 'spica/memoize';
 import { Clock } from 'spica/clock';
@@ -18,48 +18,50 @@ const attrspecs = {
 Object.setPrototypeOf(attrspecs, null);
 Object.values(attrspecs).forEach(o => Object.setPrototypeOf(o, null));
 
-export const html: HTMLParser = lazy(() => validate('<', validate(/^<[a-z]+(?=[^\S\n]|>)/i, creation(1, Recursion.inline, syntax(3, State.none, union([
-  focus(
-    /^<wbr[^\S\n]*>/i,
-    () => [[h('wbr')], '']),
-  surround(
-    // https://html.spec.whatwg.org/multipage/syntax.html#void-elements
-    str(/^<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[^\S\n]|>)/i), some(union([attribute])), str(/^[^\S\n]*>/), true,
-    ([as, bs = [], cs], rest) =>
-      [[elem(as[0].slice(1), push(unshift(as, bs), cs), [], [])], rest]),
-  match(
-    new RegExp(String.raw`^<(${TAGS.join('|')})(?=[^\S\n]|>)`),
-    memoize(
-    ([, tag]) =>
-      surround<HTMLParser.TagParser, string>(surround(
-        str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
-        subsequence([
-          focus(/^[^\S\n]*\n/, some(inline)),
-          some(open(/^\n?/, some(inline, blankWith('\n', `</${tag}>`), [[blankWith('\n', `</${tag}>`), 3]]), true)),
-        ]),
-        str(`</${tag}>`), true,
-        ([as, bs = [], cs], rest) =>
-          [[elem(tag, as, bs, cs)], rest],
-        ([as, bs = []], rest) =>
-          [[elem(tag, as, bs, [])], rest]))),
-  match(
-    /^<([a-z]+)(?=[^\S\n]|>)/i,
-    memoize(
-    ([, tag]) =>
-      surround<HTMLParser.TagParser, string>(surround(
-        str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
-        subsequence([
-          focus(/^[^\S\n]*\n/, some(inline)),
-          some(inline, `</${tag}>`, [[`</${tag}>`, 3]]),
-        ]),
-        str(`</${tag}>`), true,
-        ([as, bs = [], cs], rest) =>
-          [[elem(tag, as, bs, cs)], rest],
-        ([as, bs = []], rest) =>
-          [[elem(tag, as, bs, [])], rest]),
-    ([, tag]) => tag,
-    new Clock(10000))),
-]))))));
+export const html: HTMLParser = lazy(() => validate('<', validate(/^<[a-z]+(?=[^\S\n]|>)/i, creation(1, Recursion.inline,
+  syntax(3, State.none,
+  union([
+    focus(
+      /^<wbr[^\S\n]*>/i,
+      () => [[h('wbr')], '']),
+    surround(
+      // https://html.spec.whatwg.org/multipage/syntax.html#void-elements
+      str(/^<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[^\S\n]|>)/i), some(union([attribute])), str(/^[^\S\n]*>/), true,
+      ([as, bs = [], cs], rest) =>
+        [[elem(as[0].slice(1), push(unshift(as, bs), cs), [], [])], rest]),
+    match(
+      new RegExp(String.raw`^<(${TAGS.join('|')})(?=[^\S\n]|>)`),
+      memoize(
+      ([, tag]) =>
+        surround<HTMLParser.TagParser, string>(surround(
+          str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
+          subsequence([
+            focus(/^[^\S\n]*\n/, some(inline)),
+            some(open(/^\n?/, some(inline, blankWith('\n', `</${tag}>`), [[blankWith('\n', `</${tag}>`), 3]]), true)),
+          ]),
+          str(`</${tag}>`), true,
+          ([as, bs = [], cs], rest) =>
+            [[elem(tag, as, bs, cs)], rest],
+          ([as, bs = []], rest) =>
+            [[elem(tag, as, bs, [])], rest]))),
+    match(
+      /^<([a-z]+)(?=[^\S\n]|>)/i,
+      memoize(
+      ([, tag]) =>
+        surround<HTMLParser.TagParser, string>(surround(
+          str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
+          subsequence([
+            focus(/^[^\S\n]*\n/, some(inline)),
+            some(inline, `</${tag}>`, [[`</${tag}>`, 3]]),
+          ]),
+          str(`</${tag}>`), true,
+          ([as, bs = [], cs], rest) =>
+            [[elem(tag, as, bs, cs)], rest],
+          ([as, bs = []], rest) =>
+            [[elem(tag, as, bs, [])], rest]),
+      ([, tag]) => tag,
+      new Clock(10000))),
+  ]))))));
 
 export const attribute: HTMLParser.AttributeParser = union([
   str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="[^"\n]*")?(?=[^\S\n]|>)/i),

package/src/parser/inline/htmlentity.ts

@@ -1,17 +1,17 @@
 import { HTMLEntityParser, UnsafeHTMLEntityParser } from '../inline';
+import { Recursion, Command } from '../context';
 import { union, creation, validate, focus, fmap } from '../../combinator';
-import { Recursion } from '../context';
 import { html } from 'typed-dom/dom';
 import { reduce } from 'spica/memoize';
 
 export const unsafehtmlentity: UnsafeHTMLEntityParser = creation(1, Recursion.ignore, validate('&', focus(
   /^&[0-9A-Za-z]{1,99};/,
-  ({ source }) => [[parse(source) ?? `\x1B${source}`], ''])));
+  ({ source }) => [[parse(source) ?? `${Command.Escape}${source}`], ''])));
 
 export const htmlentity: HTMLEntityParser = fmap(
   union([unsafehtmlentity]),
   ([text]) => [
-    text[0] === '\x1B'
+    text[0] === Command.Escape
       ? html('span', {
           class: 'invalid',
           'data-invalid-syntax': 'htmlentity',

package/src/parser/inline/insertion.ts

@@ -1,8 +1,8 @@
 import { InsertionParser } from '../inline';
+import { State, Recursion } from '../context';
 import { union, some, syntax, creation, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { State, Recursion } from '../context';
 import { blankWith } from '../visibility';
 import { unshift } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';

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

@@ -1,10 +1,15 @@
-import { link } from './link';
-import { some } from '../../combinator';
+import { LinkParser } from '../inline';
+import { textlink, medialink } from './link';
+import { some, union } from '../../combinator';
 import { inspect } from '../../debug.test';
 import { MarkdownParser } from '../../../markdown';
 
 describe('Unit: parser/inline/link', () => {
   describe('link', () => {
+    const link: LinkParser = union([
+      medialink,
+      textlink,
+    ]);
     const parser = (source: string, context: MarkdownParser.Context = {}) => some(link)({ source, context });
 
     it('xss', () => {

package/src/parser/inline/link.ts

@@ -1,11 +1,11 @@
 import { MarkdownParser } from '../../../markdown';
 import { LinkParser } from '../inline';
+import { State, Recursion, Backtrack } from '../context';
 import { union, inits, tails, sequence, some, constraint, syntax, creation, precedence, validate, surround, open, dup, reverse, lazy, fmap, bind } from '../../combinator';
 import { inline, media, shortmedia } from '../inline';
 import { attributes } from './html';
 import { linebreak, unescsource, str } from '../source';
-import { State, Recursion, Backtrack } from '../context';
-import { trimBlankStart, trimNodeEnd } from '../visibility';
+import { trimBlankStart, trimBlankNodeEnd } from '../visibility';
 import { stringify } from '../util';
 import { ReadonlyURL } from 'spica/url';
 import { html, define, defrag } from 'typed-dom/dom';
@@ -15,18 +15,13 @@ const optspec = {
 } as const;
 Object.setPrototypeOf(optspec, null);
 
-export const link: LinkParser = lazy(() => validate(['[', '{'], union([
-  medialink,
-  textlink,
-])));
-
-export const textlink: LinkParser.TextLinkParser = lazy(() => creation(1, Recursion.ignore,
+export const textlink: LinkParser.TextLinkParser = lazy(() => validate(['[', '{'], creation(1, Recursion.ignore,
   constraint(State.link, false,
   syntax(1, State.linkers | State.media,
   bind(reverse(tails([
     dup(surround(
       '[',
-      trimBlankStart(some(union([inline]), ']', [[/^\\?\n/, 9], [']', 1]])),
+      trimBlankStart(some(union([inline]), ']', [['\n', 9], [']', 1]])),
       ']',
       true, undefined, undefined, 1 | Backtrack.bracket)),
     dup(surround(
@@ -38,11 +33,11 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => creation(1, Recurs
   ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) => {
     assert(!html('div', content).querySelector('a, .media, .annotation, .reference'));
     assert(content[0] !== '');
-    if (content.length !== 0 && trimNodeEnd(content = defrag(content)).length === 0) return;
-    return [[parse(content, params, context)], rest];
-  })))));
+    if (content.length !== 0 && trimBlankNodeEnd(content).length === 0) return;
+    return [[parse(defrag(content), params, context)], rest];
+  }))))));
 
-export const medialink: LinkParser.MediaLinkParser = lazy(() => creation(1, Recursion.ignore,
+export const medialink: LinkParser.MediaLinkParser = lazy(() => validate(['[', '{'], creation(1, Recursion.ignore,
   constraint(State.link | State.media, false,
   syntax(1, State.linkers,
   bind(reverse(sequence([
@@ -53,7 +48,7 @@ export const medialink: LinkParser.MediaLinkParser = lazy(() => creation(1, Recu
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
   ])),
   ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) =>
-    [[parse(defrag(content), params, context)], rest])))));
+    [[parse(defrag(content), params, context)], rest]))))));
 
 export const linemedialink: LinkParser.LineMediaLinkParser = surround(
   linebreak,
@@ -61,7 +56,8 @@ export const linemedialink: LinkParser.LineMediaLinkParser = surround(
   /^(?=[^\S\n]*(?:$|\n))/);
 
 export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() =>
-  creation(1, Recursion.ignore, precedence(1,
+  creation(1, Recursion.ignore,
+  precedence(1,
   bind(reverse(tails([
     dup(surround(
       '[',