securemark 0.283.4 → 0.283.5

package/src/parser/block/heading.ts

@@ -1,9 +1,9 @@
 import { HeadingParser } from '../block';
+import { State } from '../context';
 import { union, some, state, block, line, validate, focus, rewrite, open, fmap } from '../../combinator';
 import { inline, indexee, indexer, dataindex } from '../inline';
 import { str } from '../source';
-import { State } from '../context';
-import { visualize, trimBlankStart, trimNodeEnd } from '../visibility';
+import { visualize, trimBlank } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 
 export const segment: HeadingParser.SegmentParser = block(validate('#', focus(
@@ -16,19 +16,19 @@ export const heading: HeadingParser = block(rewrite(segment,
   line(indexee(fmap(union([
     open(
       str(/^##+/),
-      visualize(trimBlankStart(some(union([indexer, inline])))), true),
+      visualize(trimBlank(some(union([indexer, inline])))), true),
     open(
       str('#'),
       state(State.linkers,
-      visualize(trimBlankStart(some(union([indexer, inline]))))), true),
+      visualize(trimBlank(some(union([indexer, inline]))))), true),
   ]),
   ([h, ...ns]: [string, ...(HTMLElement | string)[]]) => [
     h.length <= 6
-      ? html(`h${h.length as 1}`, { 'data-index': dataindex(ns) }, trimNodeEnd(defrag(ns)))
+      ? html(`h${h.length as 1}`, { 'data-index': dataindex(ns) }, defrag(ns))
       : html(`h6`, {
           class: 'invalid',
           'data-invalid-syntax': 'heading',
           'data-invalid-type': 'syntax',
           'data-invalid-message': 'Heading level must be up to 6',
-        }, trimNodeEnd(defrag(ns)))
+        }, defrag(ns))
   ]))))));

package/src/parser/block/ilist.ts

@@ -1,9 +1,9 @@
 import { IListParser } from '../block';
+import { Recursion } from '../context';
 import { union, inits, some, creation, block, line, validate, indent, open, trim, fallback, lazy, fmap } from '../../combinator';
 import { ulist_, invalid, fillFirstLine } from './ulist';
 import { olist_ } from './olist';
 import { inline } from '../inline';
-import { Recursion } from '../context';
 import { lineable } from '../util';
 import { visualize, trimBlank } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';

package/src/parser/block/olist.ts

@@ -1,11 +1,11 @@
 import { OListParser } from '../block';
+import { Recursion } from '../context';
 import { union, inits, subsequence, some, creation, block, line, validate, indent, focus, open, match, trim, fallback, lazy, fmap } from '../../combinator';
 import { ulist_, checkbox, invalid, fillFirstLine } from './ulist';
 import { ilist_ } from './ilist';
 import { inline, indexee, indexer, dataindex } from '../inline';
 import { lineable } from '../util';
 import { visualize, trimBlank } from '../visibility';
-import { Recursion } from '../context';
 import { memoize } from 'spica/memoize';
 import { html, define, defrag } from 'typed-dom/dom';
 

package/src/parser/block/paragraph.ts

@@ -2,9 +2,9 @@ import { ParagraphParser } from '../block';
 import { union, some, block, fmap } from '../../combinator';
 import { inline } from '../inline';
 import { lineable } from '../util';
-import { visualize, trimNodeEnd } from '../visibility';
+import { visualize, trimBlankEnd } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 
 export const paragraph: ParagraphParser = block(fmap(
-  visualize(lineable(some(union([inline])))),
-  ns => [html('p', trimNodeEnd(defrag(ns)))]));
+  visualize(trimBlankEnd(lineable(some(union([inline]))))),
+  ns => [html('p', defrag(ns))]));

package/src/parser/block/reply.ts

@@ -5,7 +5,7 @@ import { quote, syntax as delimiter } from './reply/quote';
 import { inline } from '../inline';
 import { anyline } from '../source';
 import { lineable } from '../util';
-import { visualize, trimNodeEnd } from '../visibility';
+import { visualize, trimBlankNodeEnd } from '../visibility';
 import { push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
@@ -30,4 +30,4 @@ export const reply: ReplyParser = block(validate('>', fmap(
         ns => push(ns, [html('br')])),
     ])),
   ]),
-  ns => [html('p', trimNodeEnd(defrag(ns)))])));
+  ns => [html('p', trimBlankNodeEnd(defrag(ns)))])));

package/src/parser/block/sidefence.ts

@@ -1,8 +1,8 @@
 import { SidefenceParser } from '../block';
+import { Recursion } from '../context';
 import { union, some, creation, block, focus, rewrite, convert, lazy, fmap } from '../../combinator';
 import { autolink } from '../autolink';
 import { contentline } from '../source';
-import { Recursion } from '../context';
 import { html, define, defrag } from 'typed-dom/dom';
 
 export const sidefence: SidefenceParser = lazy(() => block(fmap(focus(

package/src/parser/block/table.ts

@@ -2,7 +2,7 @@ import { TableParser } from '../block';
 import { union, sequence, some, block, line, validate, focus, rewrite, surround, open, close, trimStart, fallback, lazy, fmap } from '../../combinator';
 import { inline, media, medialink, shortmedia } from '../inline';
 import { contentline } from '../source';
-import { trimBlankStart, trimNodeEnd } from '../visibility';
+import { trimBlank } from '../visibility';
 import { duffReduce } from 'spica/duff';
 import { push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
@@ -53,17 +53,17 @@ const cell: CellParser = surround(
     close(medialink, /^\s*(?=\||$)/),
     close(media, /^\s*(?=\||$)/),
     close(shortmedia, /^\s*(?=\||$)/),
-    trimBlankStart(some(inline, /^\|/, [[/^[|\\]?\s*$/, 9]])),
+    trimBlank(some(inline, /^\|/, [[/^[|\\]?\s*$/, 9]])),
   ])),
   /^[^|]*/, true);
 
 const head: CellParser.HeadParser = fmap(
   cell,
-  ns => [html('th', trimNodeEnd(defrag(ns)))]);
+  ns => [html('th', defrag(ns))]);
 
 const data: CellParser.DataParser = fmap(
   cell,
-  ns => [html('td', trimNodeEnd(defrag(ns)))]);
+  ns => [html('td', defrag(ns))]);
 
 function format(rows: HTMLTableRowElement[]): HTMLTableRowElement[] {
   const aligns = rows[0].className === 'invalid'

package/src/parser/block/ulist.ts

@@ -1,11 +1,11 @@
 import { UListParser } from '../block';
 import { Parser } from '../../combinator/data/parser';
+import { Recursion } from '../context';
 import { union, inits, subsequence, some, creation, block, line, validate, indent, focus, rewrite, open, trim, fallback, lazy, fmap } from '../../combinator';
 import { olist_ } from './olist';
 import { ilist_ } from './ilist';
 import { inline, indexer, indexee, dataindex } from '../inline';
 import { contentline } from '../source';
-import { Recursion } from '../context';
 import { lineable } from '../util';
 import { visualize, trimBlank } from '../visibility';
 import { unshift } from 'spica/array';

package/src/parser/block.ts

@@ -1,4 +1,5 @@
 import { MarkdownParser } from '../../markdown';
+import { Recursion, Command } from './context';
 import { union, reset, open, fallback, recover } from '../combinator';
 import { emptyline } from './source';
 import { pagebreak } from './block/pagebreak';
@@ -16,7 +17,6 @@ import { blockquote } from './block/blockquote';
 import { mediablock } from './block/mediablock';
 import { reply } from './block/reply';
 import { paragraph } from './block/paragraph';
-import { Recursion } from './context';
 import { rnd0Z } from 'spica/random';
 import { html } from 'typed-dom/dom';
 
@@ -71,8 +71,9 @@ export const block: BlockParser = reset(
   ])));
 
 function error(parser: BlockParser): BlockParser {
+  const reg = new RegExp(String.raw`^${Command.Error}.*\n`)
   return recover<BlockParser>(fallback(
-    open('\x07', ({source}) => { throw new Error(source.split('\n', 1)[0]); }),
+    open(Command.Error, ({ source }) => { throw new Error(source.split('\n', 1)[0]); }),
     parser),
     ({ source, context: { id } }, reason) => [[
       html('h1',
@@ -89,7 +90,7 @@ function error(parser: BlockParser): BlockParser {
           translate: 'no',
         },
         source
-          .replace(/^\x07.*\n/, '')
+          .replace(reg, '')
           .slice(0, 1001)
           .replace(/^(.{997}).{4}$/s, '$1...') || undefined),
     ], '']);

package/src/parser/context.ts

@@ -38,3 +38,13 @@ export const enum Backtrack {
   url = 2 << 2,
   bracket = 1 << 2,
 }
+
+export const enum Command {
+  Error = '\x07',
+  Escape = '\x1B',
+  Separator = '\x1F',
+}
+
+export const CmdRegExp = {
+  Escape: /\x1B/g,
+} as const;

package/src/parser/inline/annotation.ts

@@ -1,16 +1,19 @@
 import { AnnotationParser } from '../inline';
+import { State, Recursion, Backtrack } from '../context';
 import { union, some, syntax, creation, constraint, surround, lazy } from '../../combinator';
 import { inline } from '../inline';
-import { State, Recursion, Backtrack } from '../context';
-import { trimBlankStart, trimNodeEnd } from '../visibility';
+import { trimBlankStart, trimBlankNodeEnd } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 
 export const annotation: AnnotationParser = lazy(() => creation(1, Recursion.ignore, surround(
   '((',
   constraint(State.annotation, false,
   syntax(1, State.annotation | State.media,
-  trimBlankStart(some(union([inline]), ')', [[/^\\?\n/, 9], [')', 1]])))),
+  trimBlankStart(some(union([inline]), ')', [['\n', 9], [')', 1]])))),
   '))',
   false,
-  ([, ns], rest) => [[html('sup', { class: 'annotation' }, [html('span', trimNodeEnd(defrag(ns)))])], rest],
+  ([, ns], rest) =>
+    trimBlankNodeEnd(ns).length > 0
+      ? [[html('sup', { class: 'annotation' }, [html('span', defrag(ns))])], rest]
+      : undefined,
   undefined, 1 | Backtrack.bracket)));

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

@@ -1,8 +1,8 @@
 import { AutolinkParser } from '../../inline';
+import { State } from '../../context';
 import { union, tails, 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/@user must be a user page or a redirect page going there.

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
+import { State } from '../../context';
 import { union, syntax, constraint, validate, focus, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
-import { State } from '../../context';
 import { define } from 'typed-dom/dom';
 
 // Timeline(pseudonym): user/tid

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

@@ -1,8 +1,8 @@
 import { AutolinkParser } from '../../inline';
+import { State } from '../../context';
 import { sequence, some, constraint, validate, bind } from '../../../combinator';
 import { account } from './account';
 import { hashtag } from './hashtag';
-import { State } from '../../context';
 import { stringify } from '../../util';
 import { define } from 'typed-dom/dom';
 

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
+import { State, Recursion } from '../../context';
 import { syntax, creation, constraint, verify, rewrite } from '../../../combinator';
 import { str } from '../../source';
-import { State, Recursion } from '../../context';
 import { html } from 'typed-dom/dom';
 
 // https://html.spec.whatwg.org/multipage/input.html

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

@@ -1,9 +1,9 @@
 import { AutolinkParser } from '../../inline';
+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(() => rewrite(

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

@@ -1,8 +1,8 @@
 import { AutolinkParser } from '../../inline';
+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.

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

@@ -1,8 +1,8 @@
 import { AutolinkParser } from '../../inline';
+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 { State, Recursion, Backtrack } from '../../context';
 
 const closer = /^[-+*=~^_,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
 

package/src/parser/inline/autolink.ts

@@ -1,4 +1,5 @@
 import { AutolinkParser } from '../inline';
+import { State } from '../context';
 import { union, some, syntax, validate, lazy, fmap } from '../../combinator';
 import { url, lineurl } from './autolink/url';
 import { email } from './autolink/email';
@@ -8,7 +9,6 @@ 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(() =>

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';

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(() => union([
-  medialink,
-  textlink,
-]));
-
 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,8 +33,8 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => validate(['[', '{'
   ([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(() => validate(['[', '{'], creation(1, Recursion.ignore,

package/src/parser/inline/mark.ts

@@ -1,10 +1,10 @@
 import { MarkParser } from '../inline';
+import { State, Recursion } from '../context';
 import { union, some, syntax, creation, constraint, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { identity, signature } from './extension/indexee';
 import { str } from '../source';
 import { startTight, blankWith } from '../visibility';
-import { State, Recursion } from '../context';
 import { unshift } from 'spica/array';
 import { html, define, defrag } from 'typed-dom/dom';
 

package/src/parser/inline/math.ts

@@ -1,7 +1,7 @@
 import { MathParser } from '../inline';
+import { Recursion } from '../context';
 import { union, some, creation, precedence, validate, focus, rewrite, surround, lazy } from '../../combinator';
 import { escsource, unescsource, str } from '../source';
-import { Recursion } from '../context';
 import { html } from 'typed-dom/dom';
 
 const forbiddenCommand = /\\(?:begin|tiny|huge|large)(?![a-z])/i;