securemark 0.283.3 → 0.283.5

package/markdown.d.ts

@@ -603,7 +603,7 @@ export namespace MarkdownParser {
         Block<'reply/cite'>,
         Parser<HTMLSpanElement | HTMLBRElement, Context, [
           SourceParser.StrParser,
-          Parser<HTMLAnchorElement, Context, [
+          Parser<string | HTMLAnchorElement, Context, [
             InlineParser.AutolinkParser.AnchorParser,
             Parser<HTMLAnchorElement, Context, []>,
             Parser<HTMLAnchorElement, Context, []>,
@@ -1147,8 +1147,9 @@ export namespace MarkdownParser {
       export interface UrlParser extends
         // https://host
         Inline<'url'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export namespace UrlParser {
@@ -1156,7 +1157,10 @@ export namespace MarkdownParser {
           Inline<'url/lineurl'>,
           Parser<string | HTMLElement, Context, [
             SourceParser.StrParser,
-            InlineParser.LinkParser.UnsafeLinkParser,
+            Parser<string | HTMLElement, Context, [
+              InlineParser.LinkParser.UnsafeLinkParser,
+              Parser<string, Context, []>,
+            ]>,
           ]> {
         }
         export interface BracketParser extends
@@ -1188,7 +1192,7 @@ export namespace MarkdownParser {
       export interface ChannelParser extends
         // @user#tag
         Inline<'channel'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           InlineParser.AutolinkParser.AccountParser,
           InlineParser.AutolinkParser.HashtagParser,
         ]> {
@@ -1196,29 +1200,33 @@ export namespace MarkdownParser {
       export interface AccountParser extends
         // @user
         Inline<'account'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export interface HashtagParser extends
         // #tag
         Inline<'hashtag'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export interface HashnumParser extends
         // #1
         Inline<'hashnum'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export interface AnchorParser extends
         // >>1
         Inline<'anchor'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
     }

package/package.json

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

package/src/combinator/control/manipulation/surround.ts

@@ -59,10 +59,10 @@ export function surround<T>(
       const { logger = {}, offset = 0 } = context;
       for (let i = 0; i < source.length - mr_.length; ++i) {
         if (source[i] !== source[0]) break;
-        const j = source.length + offset - i;
-        if (!(j in logger)) continue;
+        const pos = source.length + offset - i - 1;
+        if (!(pos in logger)) continue;
         assert(log >>> 2);
-        if (logger[j] & 1 << (log >>> 2)) return;
+        if (logger[pos] & 1 << (log >>> 2)) return;
       }
     }
     const res2 = mr_ !== '' ? parser({ source: mr_, context }) : undefined;
@@ -77,7 +77,7 @@ export function surround<T>(
     if (rest.length === lmr_.length) return;
     if (log & 2 && rr === undefined) {
       const { logger = {}, offset = 0 } = context;
-      logger[source.length + offset] |= 1 << (log >>> 2);
+      logger[source.length + offset - 1] |= 1 << (log >>> 2);
     }
     return rr
       ? f

package/src/combinator/data/parser/context/delimiter.ts

@@ -33,7 +33,7 @@ export class Delimiters {
     this.signature);
   private readonly registry = memoize<(signature: string) => Delimiter[]>(() => []);
   private readonly delimiters: Delimiter[] = [];
-  private readonly order: number[] = [];
+  private readonly stack: number[] = [];
   private readonly states: (readonly number[])[] = [];
   public push(
     delims: readonly {
@@ -42,14 +42,14 @@ export class Delimiters {
       readonly precedence: number;
     }[]
   ): void {
-    const { registry, delimiters, order } = this;
-    // 構文数x優先順位数以下
+    const { registry, delimiters, stack } = this;
+    // シグネチャ数以下
     assert(delimiters.length < 100);
     for (let i = 0; i < delims.length; ++i) {
       const { signature, matcher, precedence } = delims[i];
-      const stack = registry(signature);
-      const index = stack[0]?.index ?? delimiters.length;
-      if (stack.length === 0 || precedence > delimiters[index].precedence) {
+      const memory = registry(signature);
+      const index = memory[0]?.index ?? delimiters.length;
+      if (memory.length === 0 || precedence > delimiters[index].precedence) {
         const delimiter: Delimiter = {
           index,
           signature,
@@ -58,34 +58,34 @@ export class Delimiters {
           state: true,
         };
         delimiters[index] = delimiter;
-        stack.push(delimiter);
-        order.push(index);
+        memory.push(delimiter);
+        stack.push(index);
       }
       else {
-        order.push(-1);
+        stack.push(-1);
       }
       // 現状各優先順位は固定
-      assert(stack.length === 1);
+      assert(memory.length === 1);
     }
   }
   public pop(count: number): void {
     assert(count > 0);
-    const { registry, delimiters, order } = this;
+    const { registry, delimiters, stack } = this;
     for (let i = 0; i < count; ++i) {
-      assert(this.order.length > 0);
-      const index = order.pop()!;
+      assert(this.stack.length > 0);
+      const index = stack.pop()!;
       if (index === -1) continue;
-      const stack = registry(delimiters[index].signature);
-      assert(stack.length > 0);
-      if (stack.length === 1) {
+      const memory = registry(delimiters[index].signature);
+      assert(memory.length > 0);
+      if (memory.length === 1) {
         assert(index === delimiters.length - 1);
-        assert(stack[0] === delimiters.at(-1));
-        stack.pop();
+        assert(memory[0] === delimiters.at(-1));
+        memory.pop();
         delimiters.pop();
       }
       else {
-        stack.pop();
-        delimiters[index] = stack.at(-1)!;
+        memory.pop();
+        delimiters[index] = memory.at(-1)!;
       }
     }
   }

package/src/combinator/data/parser/context.ts

@@ -96,11 +96,12 @@ export function precedence<T>(precedence: number, parser: Parser<T>): Parser<T>
   assert(precedence >= 0);
   return ({ source, context }) => {
     const { delimiters, precedence: p = 0 } = context;
-    const shift = precedence > p;
+    const shift = delimiters && precedence > p;
     context.precedence = precedence;
-    shift && delimiters?.shift(precedence);
+    // デリミタはシフト後に設定しなければならない
+    shift && delimiters.shift(precedence);
     const result = parser({ source, context });
-    shift && delimiters?.unshift();
+    shift && delimiters.unshift();
     context.precedence = p;
     return result;
   };

package/src/parser/block/blockquote.ts

@@ -1,8 +1,8 @@
 import { BlockquoteParser } from '../block';
+import { Recursion } from '../context';
 import { union, some, creation, block, validate, rewrite, open, convert, lazy, fmap } from '../../combinator';
 import { autolink } from '../autolink';
 import { contentline } from '../source';
-import { Recursion } from '../context';
 import { parse } from '../api/parse';
 import { html, defrag } from 'typed-dom/dom';
 

package/src/parser/block/dlist.ts

@@ -1,10 +1,10 @@
 import { DListParser } from '../block';
+import { State } from '../context';
 import { union, inits, some, state, block, line, validate, rewrite, open, lazy, fmap } from '../../combinator';
 import { inline, indexee, indexer, dataindex } from '../inline';
 import { anyline } from '../source';
-import { State } from '../context';
 import { lineable } from '../util';
-import { visualize, trimBlankStart, trimNodeEnd } from '../visibility';
+import { visualize, trimBlank, trimBlankEnd } from '../visibility';
 import { push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
@@ -19,17 +19,17 @@ export const dlist: DListParser = lazy(() => block(fmap(validate(
 
 const term: DListParser.TermParser = line(indexee(fmap(open(
   /^~[^\S\n]+(?=\S)/,
-  visualize(trimBlankStart(some(union([indexer, inline])))),
+  visualize(trimBlank(some(union([indexer, inline])))),
   true),
-  ns => [html('dt', { 'data-index': dataindex(ns) }, trimNodeEnd(defrag(ns)))])));
+  ns => [html('dt', { 'data-index': dataindex(ns) }, defrag(ns))])));
 
 const desc: DListParser.DescriptionParser = block(fmap(open(
   /^:[^\S\n]+(?=\S)|/,
   rewrite(
     some(anyline, /^[~:][^\S\n]+\S/),
-    visualize(lineable(some(union([inline]))))),
+    visualize(trimBlankEnd(lineable(some(union([inline])))))),
   true),
-  ns => [html('dd', trimNodeEnd(defrag(ns)))]),
+  ns => [html('dd', defrag(ns))]),
   false);
 
 function fillTrailingDescription(es: HTMLElement[]): HTMLElement[] {

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

@@ -1,7 +1,7 @@
 import { ExtensionParser } from '../../block';
+import { Recursion } from '../../context';
 import { creation, block, validate, fence, fmap } from '../../../combinator';
 import { identity } from '../../inline/extension/indexee';
-import { Recursion } from '../../context';
 import { parse } from '../../api/parse';
 import { html } from 'typed-dom/dom';
 

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

@@ -1,9 +1,9 @@
 import { ExtensionParser } from '../../block';
+import { Recursion } from '../../context';
 import { eval } from '../../../combinator/data/parser';
 import { creation, block, validate, fence, fmap } from '../../../combinator';
-import { parse } from '../../api/parse';
 import { mathblock } from '../mathblock';
-import { Recursion } from '../../context';
+import { parse } from '../../api/parse';
 import { html } from 'typed-dom/dom';
 
 const opener = /^(~{3,})(?:example\/(\S+))?(?!\S)([^\n]*)(?:$|\n)/;

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

@@ -12,7 +12,7 @@ import { table, segment_ as seg_table } from './table';
 import { blockquote, segment as seg_blockquote } from '../blockquote';
 import { placeholder, segment_ as seg_placeholder } from './placeholder';
 import { inline, media, shortmedia } from '../../inline';
-import { visualize, trimBlankStart, trimNodeEnd } from '../../visibility';
+import { visualize, trimBlank } from '../../visibility';
 import { memoize } from 'spica/memoize';
 import { html, defrag } from 'typed-dom/dom';
 
@@ -63,7 +63,7 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
         line(shortmedia),
       ])),
       emptyline,
-      block(visualize(trimBlankStart(some(inline)))),
+      block(visualize(trimBlank(some(inline)))),
     ]),
   ])),
   ([label, param, content, ...caption]: [HTMLAnchorElement, string, ...HTMLElement[]]) => [
@@ -72,7 +72,7 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
       [
         html('figcaption', [
           html('span', { class: 'figindex' }),
-          html('span', { class: 'figtext' }, trimNodeEnd(defrag(caption))),
+          html('span', { class: 'figtext' }, defrag(caption)),
         ]),
         html('div', [content]),
       ])

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

@@ -5,7 +5,7 @@ import { union, subsequence, inits, some, block, line, validate, fence, rewrite,
 import { inline, medialink, media, shortmedia } from '../../inline';
 import { str, anyline, emptyline, contentline } from '../../source';
 import { lineable } from '../../util';
-import { visualize, trimBlankStart, trimNodeEnd } from '../../visibility';
+import { visualize, trimBlank, trimBlankEnd } from '../../visibility';
 import { unshift, splice } from 'spica/array';
 import { html, define, defrag } from 'typed-dom/dom';
 
@@ -89,10 +89,10 @@ const head: CellParser.HeadParser = block(fmap(open(
       block(surround(/^[^\n]/, medialink, /^\s*$/)),
       block(surround(/^[^\n]/, media, /^\s*$/)),
       block(surround(/^[^\n]/, shortmedia, /^\s*$/)),
-      open(/^(?:\s*\n|\s)/, visualize(trimBlankStart(some(inline))), true),
+      open(/^(?:\s*\n|\s)/, visualize(trimBlank(some(inline))), true),
     ])),
   true),
-  ns => [html('th', attributes(ns.shift()! as string), trimNodeEnd(defrag(ns)))]),
+  ns => [html('th', attributes(ns.shift()! as string), defrag(ns))]),
   false);
 
 const data: CellParser.DataParser = block(fmap(open(
@@ -106,10 +106,10 @@ const data: CellParser.DataParser = block(fmap(open(
       block(surround(/^[^\n]/, medialink, /^\s*$/)),
       block(surround(/^[^\n]/, media, /^\s*$/)),
       block(surround(/^[^\n]/, shortmedia, /^\s*$/)),
-      open(/^(?:\s*\n|\s)/, visualize(lineable(some(inline))), true),
+      open(/^(?:\s*\n|\s)/, visualize(trimBlankEnd(lineable(some(inline)))), true),
     ])),
   true),
-  ns => [html('td', attributes(ns.shift()! as string), trimNodeEnd(defrag(ns)))]),
+  ns => [html('td', attributes(ns.shift()! as string), defrag(ns))]),
   false);
 
 const dataline: CellParser.DatalineParser = line(

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

@@ -1,13 +1,12 @@
 export const enum State {
-  annotation = 1 << 8,
-  reference = 1 << 7,
-  index = 1 << 6,
-  label = 1 << 5,
-  link = 1 << 4,
-  media = 1 << 3,
-  mark = 1 << 2,
-  autolink = 1 << 1,
-  shortcut = 1 << 0,
+  annotation = 1 << 7,
+  reference = 1 << 6,
+  index = 1 << 5,
+  label = 1 << 4,
+  link = 1 << 3,
+  media = 1 << 2,
+  mark = 1 << 1,
+  autolink = 1 << 0,
   none = 0,
   all = ~0,
   linkers = 0
@@ -39,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,26 +1,27 @@
 import { AutolinkParser } from '../../inline';
-import { union, tails, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+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.
 
-export const account: AutolinkParser.AccountParser = lazy(() => fmap(rewrite(
-  constraint(State.shortcut, false,
+export const account: AutolinkParser.AccountParser = lazy(() => rewrite(
   open(
     '@',
     tails([
       str(/^[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])?)*\//i),
       str(/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*/i),
-    ]))),
-  convert(
-    source =>
-      `[${source}]{ ${
-      source.includes('/')
-        ? `https://${source.slice(1).replace('/', '/@')}`
-        : `/${source}`
-      } }`,
-    union([unsafelink]))),
-  ([el]) => [define(el, { class: 'account' })]));
+    ])),
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+      source =>
+        `[${source}]{ ${source.includes('/')
+          ? `https://${source.slice(1).replace('/', '/@')}`
+          : `/${source}`
+        } }`,
+      unsafelink),
+      ([el]) => [define(el, { class: 'account' })]))),
+    ({ source }) => [[source], ''],
+  ])));