securemark 0.299.3 → 0.300.0

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

@@ -1,7 +1,6 @@
 import { annotation } from './annotation';
 import { some } from '../../combinator';
-import { input } from '../../combinator/data/parser';
-import { Context } from '../context';
+import { input } from '../context';
 import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/annotation', () => {
@@ -9,60 +8,60 @@ describe('Unit: parser/inline/annotation', () => {
     const parser = some(annotation);
 
     it('invalid', () => {
-      assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('(', new Context())), [['<span class="paren">(</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('()', new Context())), [ [ '<span class="paren">()</span>' ], '' ]);
-      assert.deepStrictEqual(inspect(parser, input('((', new Context())), [ [ '<span class="paren">(<span class="paren">(</span></span>' ], '' ]);
-      assert.deepStrictEqual(inspect(parser, input('(())', new Context())), [['<span class="paren">(<span class="paren">()</span>)</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(()))', new Context())), [['<span class="paren">(<span class="paren">()</span>)</span>'], ')']);
-      assert.deepStrictEqual(inspect(parser, input('(("))', new Context())), [['<span class="paren">(<span class="paren">("))</span></span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a', new Context())), [['<span class="paren">(<span class="paren">(a</span></span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a)', new Context())), [['<span class="paren">(<span class="paren">(a)</span></span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a)b)', new Context())), [['<span class="paren">(<span class="paren">(a)</span>b)</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(([))', new Context())), [['<span class="paren">(<span class="paren">([))</span></span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(([%))', new Context())), [['<span class="paren">(<span class="paren">([%))</span></span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(( ))', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('(( a))', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('(( a ))', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('((\\ a))', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('((<wbr>a))', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('((\n))', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('((\na))', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('((\\\na))', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('((a\n))', new Context())), [['<span class="bracket">(<span class="bracket">(a<br>)</span>)</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a\\\n))', new Context())), [['<span class="bracket">(<span class="bracket">(a<br>)</span>)</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a\nb))', new Context())), [['<span class="bracket">(<span class="bracket">(a<br>b)</span>)</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a\\\nb))', new Context())), [['<span class="bracket">(<span class="bracket">(a<br>b)</span>)</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((*a\nb*))', new Context())), [['<span class="bracket">(<span class="bracket">(<em>a<br>b</em>)</span>)</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((\\))', new Context())), [['<span class="paren">(<span class="paren">())</span></span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(((a))', new Context())), [['<span class="paren">(<sup class="annotation"><span>a</span></sup></span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((((a)))', new Context())), [['<span class="paren">(<sup class="annotation"><span><span class="paren">(a)</span></span></sup></span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(((((a))))', new Context())), [['<span class="paren">(<sup class="annotation"><span><sup class="annotation"><span>a</span></sup></span></sup></span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((((((a)))b)))', new Context())), [['<sup class="annotation"><span><span class="paren">(<sup class="annotation"><span><span class="paren">(a)</span></span></sup>b)</span></span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(((((((a)))b)))', new Context())), [['<span class="paren">(<sup class="annotation"><span><span class="paren">(<sup class="annotation"><span><span class="paren">(a)</span></span></sup>b)</span></span></sup></span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input(' ((a))', new Context())), undefined);
+      assert.deepStrictEqual(inspect(parser, input('')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('(')), [['<span class="paren">(</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('()')), [ [ '<span class="paren">()</span>' ], '' ]);
+      assert.deepStrictEqual(inspect(parser, input('((')), [ [ '<span class="paren">(<span class="paren">(</span></span>' ], '' ]);
+      assert.deepStrictEqual(inspect(parser, input('(())')), [['<span class="paren">(<span class="paren">()</span>)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(()))')), [['<span class="paren">(<span class="paren">()</span>)</span>'], ')']);
+      assert.deepStrictEqual(inspect(parser, input('(("))')), [['<span class="paren">(<span class="paren">("))</span></span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a')), [['<span class="paren">(<span class="paren">(a</span></span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a)')), [['<span class="paren">(<span class="paren">(a)</span></span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a)b)')), [['<span class="paren">(<span class="paren">(a)</span>b)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(([))')), [['<span class="paren">(<span class="paren">([))</span></span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(([%))')), [['<span class="paren">(<span class="paren">([%))</span></span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(( ))')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('(( a))')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('(( a ))')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('((\\ a))')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('((<wbr>a))')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('((\n))')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('((\na))')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('((\\\na))')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('((a\n))')), [['<span class="bracket">(<span class="bracket">(a<br>)</span>)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a\\\n))')), [['<span class="bracket">(<span class="bracket">(a<br>)</span>)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a\nb))')), [['<span class="bracket">(<span class="bracket">(a<br>b)</span>)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a\\\nb))')), [['<span class="bracket">(<span class="bracket">(a<br>b)</span>)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((*a\nb*))')), [['<span class="bracket">(<span class="bracket">(<em>a<br>b</em>)</span>)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((\\))')), [['<span class="paren">(<span class="paren">())</span></span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(((a))')), [['<span class="paren">(<sup class="annotation"><span>a</span></sup></span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((((a)))')), [['<span class="paren">(<sup class="annotation"><span><span class="paren">(a)</span></span></sup></span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(((((a))))')), [['<span class="paren">(<sup class="annotation"><span><sup class="annotation"><span>a</span></sup></span></sup></span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((((((a)))b)))')), [['<sup class="annotation"><span><span class="paren">(<sup class="annotation"><span><span class="paren">(a)</span></span></sup>b)</span></span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(((((((a)))b)))')), [['<span class="paren">(<sup class="annotation"><span><span class="paren">(<sup class="annotation"><span><span class="paren">(a)</span></span></sup>b)</span></span></sup></span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input(' ((a))')), undefined);
     });
 
     it('basic', () => {
-      assert.deepStrictEqual(inspect(parser, input('((a))', new Context())), [['<sup class="annotation"><span>a</span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a ))', new Context())), [['<sup class="annotation"><span>a</span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a  ))', new Context())), [['<sup class="annotation"><span>a</span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a &nbsp;))', new Context())), [['<sup class="annotation"><span>a</span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a <wbr>))', new Context())), [['<sup class="annotation"><span>a</span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((ab))', new Context())), [['<sup class="annotation"><span>ab</span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a))')), [['<sup class="annotation"><span>a</span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a ))')), [['<sup class="annotation"><span>a</span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a  ))')), [['<sup class="annotation"><span>a</span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a &nbsp;))')), [['<sup class="annotation"><span>a</span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a <wbr>))')), [['<sup class="annotation"><span>a</span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((ab))')), [['<sup class="annotation"><span>ab</span></sup>'], '']);
     });
 
     it('nest', () => {
-      assert.deepStrictEqual(inspect(parser, input('((`a`))', new Context())), [['<sup class="annotation"><span><code data-src="`a`">a</code></span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((@a))', new Context())), [['<sup class="annotation"><span><a class="account" href="/@a">@a</a></span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((http://host))', new Context())), [['<sup class="annotation"><span><a class="url" href="http://host" target="_blank">http://host</a></span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((![]{a}))', new Context())), [['<sup class="annotation"><span>!<a class="url" href="a">a</a></span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a(())))', new Context())), [['<sup class="annotation"><span>a<span class="paren">(<span class="paren">()</span>)</span></span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((a[[]]))', new Context())), [['<sup class="annotation"><span>a[[]]</span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(([[a] ]))', new Context())), [['<sup class="annotation"><span>[[a] ]</span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(((a)))', new Context())), [['<sup class="annotation"><span><span class="paren">(a)</span></span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('((((a))))', new Context())), [['<sup class="annotation"><span><sup class="annotation"><span>a</span></sup></span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(([[a]]))', new Context())), [['<sup class="annotation"><span><sup class="reference"><span>a</span></sup></span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((`a`))')), [['<sup class="annotation"><span><code data-src="`a`">a</code></span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((@a))')), [['<sup class="annotation"><span><a class="account" href="/@a">@a</a></span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((http://host))')), [['<sup class="annotation"><span><a class="url" href="http://host" target="_blank">http://host</a></span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((![]{a}))')), [['<sup class="annotation"><span>!<a class="url" href="a">a</a></span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a(())))')), [['<sup class="annotation"><span>a<span class="paren">(<span class="paren">()</span>)</span></span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((a[[]]))')), [['<sup class="annotation"><span>a[[]]</span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(([[a] ]))')), [['<sup class="annotation"><span>[[a] ]</span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(((a)))')), [['<sup class="annotation"><span><span class="paren">(a)</span></span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('((((a))))')), [['<sup class="annotation"><span><sup class="annotation"><span>a</span></sup></span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(([[a]]))')), [['<sup class="annotation"><span><sup class="reference"><span>a</span></sup></span></sup>'], '']);
     });
 
   });

package/src/parser/inline/annotation.ts

@@ -1,7 +1,7 @@
 import { AnnotationParser } from '../inline';
 import { State, Recursion, Command } from '../context';
-import { List, Node } from '../../combinator/data/parser';
-import { union, some, precedence, constraint, surround, lazy } from '../../combinator';
+import { List, Node } from '../../combinator/parser';
+import { union, some, precedence, constraint, backtrack, surround, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { bracketname } from './bracket';
 import { repeat } from '../repeat';
@@ -23,41 +23,39 @@ import { html, defrag } from 'typed-dom/dom';
 // 原理的には逆順処理により圧縮後正順で再附番すればすべて解決するはずだがテキストとシグネチャとハッシュも
 // 修正する必要があるためほぼ完全な二重処理が必要になり三重以上の注釈という不適切な使用のために
 // 常に非常に非効率な処理を行い常時低速化するより三重以上の注釈を禁止して効率性を維持するのが妥当である。
-const MAX_DEPTH = 20;
 export const annotation: AnnotationParser = lazy(() => constraint(State.annotation,
-  repeat('(', beforeNonblank, ')', Recursion.bracket, precedence(1, surround(
+  repeat('(', beforeNonblank, ')', Recursion.inline, precedence(1, backtrack(surround(
     '',
     some(union([inline]), ')', [[')', 1]]),
     ')',
     false, [],
-    ([, bs], { buffer }) => buffer.import(bs),
-    ([, bs], { buffer }) => bs && buffer.import(bs).push(new Node(Command.Cancel)) && buffer)),
-    (nodes, context, lead, follow) => {
-      const { linebreak, recursion, resources } = context;
+    ([, bs], _, output) => output.import(bs),
+    ([, bs], _, output) => bs && output.import(bs.push(new Node(Command.Cancel)))))),
+    (nodes, input, output, lead, follow) => {
+      const { linebreak, recursion, resources } = input;
       if (linebreak !== 0 || nodes.length === 0 || lead === 0 || follow % 2 === 0) {
         nodes.unshift(new Node('('));
         nodes.push(new Node(')'));
         return new List([
-          new Node(html('span', { class: bracketname(context, 1, 1) }, defrag(unwrap(nodes))))
+          new Node(html('span', { class: bracketname(input, 1, 1) }, defrag(unwrap(nodes))))
         ]);
       }
-      recursion.add(
-        MAX_DEPTH - (resources?.recursions[Recursion.bracket] ?? resources?.recursions.at(-1) ?? MAX_DEPTH));
-      context.position += 1;
+      output.error ??= recursion.add(resources?.recursions[Recursion.inline] ?? resources?.recursions.at(-1));
+      input.position += 1;
       return new List([
         new Node(html('sup', { class: 'annotation' }, [
           html('span', defrag(unwrap(trimBlankNodeEnd(nodes))))
         ]))
       ]);
     },
-    (nodes, context, prefix, postfix) => {
+    (nodes, input, output, prefix, postfix) => {
       assert(postfix === 0);
       for (let i = 0; i < prefix; ++i) {
         nodes.unshift(new Node('('));
         nodes = new List([
-          new Node(html('span', { class: bracketname(context, 0, 0) }, defrag(unwrap(nodes))))
+          new Node(html('span', { class: bracketname(input, 0, 0) }, defrag(unwrap(nodes))))
         ]);
-        context.range += 1;
+        input.range += 1;
       }
-      return nodes;
+      return output.import(nodes);
     })));

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

@@ -1,7 +1,6 @@
 import { autolink } from '../autolink';
 import { some } from '../../../combinator';
-import { input } from '../../../combinator/data/parser';
-import { Context } from '../../context';
+import { input } from '../../context';
 import { inspect } from '../../../debug.test';
 
 describe('Unit: parser/inline/autolink/account', () => {
@@ -9,40 +8,40 @@ describe('Unit: parser/inline/autolink/account', () => {
     const parser = some(autolink);
 
     it('invalid', () => {
-      assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@+', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@_', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@-', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@.', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@0', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a@', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a@b', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a@b@c', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@ab@', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@@', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@@a', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@@@a', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@#', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@#a', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a_b', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a.b:c', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a.domain.com:b', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@http://host', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input(' @a', new Context())), undefined);
+      assert.deepStrictEqual(inspect(parser, input('')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@+')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@_')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@-')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@.')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@0')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a@')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a@b')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a@b@c')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@ab@')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@@')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@@a')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@@@a')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@#')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@#a')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a_b')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a.b:c')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a.domain.com:b')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@http://host')), undefined);
+      assert.deepStrictEqual(inspect(parser, input(' @a')), undefined);
     });
 
     it('valid', () => {
-      assert.deepStrictEqual(inspect(parser, input('@a', new Context())), [['<a class="account" href="/@a">@a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('@A', new Context())), [['<a class="account" href="/@A">@A</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('@a-', new Context())), [['<a class="account" href="/@a">@a</a>'], '-']);
-      assert.deepStrictEqual(inspect(parser, input('@a-b', new Context())), [['<a class="account" href="/@a-b">@a-b</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('@a--b', new Context())), [['<a class="account" href="/@a">@a</a>'], '--b']);
-      assert.deepStrictEqual(inspect(parser, input('@a_', new Context())), [['<a class="account" href="/@a">@a</a>'], '_']);
-      assert.deepStrictEqual(inspect(parser, input('@a.', new Context())), [['<a class="account" href="/@a">@a</a>'], '.']);
-      assert.deepStrictEqual(inspect(parser, input('@a.domain.com', new Context())), [['<a class="account" href="/@a.domain.com">@a.domain.com</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('@domain/a', new Context())), [['<a class="account" href="https://domain/@a" target="_blank">@domain/a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('@domain.com/a', new Context())), [['<a class="account" href="https://domain.com/@a" target="_blank">@domain.com/a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('@a')), [['<a class="account" href="/@a">@a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('@A')), [['<a class="account" href="/@A">@A</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('@a-')), [['<a class="account" href="/@a">@a</a>'], '-']);
+      assert.deepStrictEqual(inspect(parser, input('@a-b')), [['<a class="account" href="/@a-b">@a-b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('@a--b')), [['<a class="account" href="/@a">@a</a>'], '--b']);
+      assert.deepStrictEqual(inspect(parser, input('@a_')), [['<a class="account" href="/@a">@a</a>'], '_']);
+      assert.deepStrictEqual(inspect(parser, input('@a.')), [['<a class="account" href="/@a">@a</a>'], '.']);
+      assert.deepStrictEqual(inspect(parser, input('@a.domain.com')), [['<a class="account" href="/@a.domain.com">@a.domain.com</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('@domain/a')), [['<a class="account" href="https://domain/@a" target="_blank">@domain/a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('@domain.com/a')), [['<a class="account" href="https://domain.com/@a" target="_blank">@domain.com/a</a>'], '']);
     });
 
   });

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
-import { List, Node } from '../../../combinator/data/parser';
-import { some, state, constraint, verify, surround, setBacktrack, lazy } from '../../../combinator';
+import { List, Node } from '../../../combinator/parser';
+import { some, state, constraint, backtrack, verify, surround, setBacktrack, lazy } from '../../../combinator';
 import { parse } from '../link';
 import { emoji } from './hashtag';
 import { str } from '../../source';
@@ -11,50 +11,49 @@ 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 account: AutolinkParser.AccountParser = lazy(() => constraint(State.autolink, state(State.autolink,
-  surround(
+  backtrack(surround(
     surround(
       /(?<![0-9a-z@#])@/yi,
       str(/[0-9a-z](?:[.-](?=[0-9a-z])|[0-9a-z]){0,254}\/|/yi),
       str(/[a-z][0-9a-z]*(?:[.-][0-9a-z]+)*(?![_.-]?[0-9a-z@]|>>|:\S)/yi),
       false,
       [3 | Backtrack.unescapable]),
-    some(surround(
+    some(backtrack(surround(
       '#',
       verify(
         str(new RegExp([
           /(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^\p{C}\p{S}\p{P}\s]|emoji))+/yu.source,
         ].join('|').replace(/emoji/g, emoji.source), 'yu')),
-        ([{ value }]) => /^[0-9]{0,4}[^0-9]/.test(value)),
+        (_, output) => /^[0-9]{0,4}[^0-9]/.test(output.peek().head!.value)),
       new RegExp([
         /(?![_.-]?[0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
       ].join('|').replace(/emoji/g, emoji.source), 'yu'),
       false,
-      [3 | Backtrack.unescapable])),
+      [3 | Backtrack.unescapable]))),
     '',
     false, [],
-    ([[{ value: host }, { value: account }], nodes], context) => {
+    ([[{ value: host }, { value: account }], nodes], input, output) => {
       const hashes = nodes.foldl((acc, { value }) => acc + '#' + value, '');
       const param = nodes.foldl((acc, { value }) => acc ? acc + '+' + value : value, '');
-      return new List([
+      return output.append(
         new Node(define(
           parse(
             new List([new Node(`@${host}${account}${hashes}`)]),
             new List([new Node(host ? `https://${host}@${account}?ch=${param}` : `/@${account}?ch=${param}`)]),
-            context),
-          { class: 'channel' }))
-      ]);
+            input),
+          { class: 'channel' })));
     },
-    ([[{ value: host }, { value: account }]], context) => {
-      if (context.source[context.position] === '#') {
-        assert(context.source[context.position - context.range] === '@');
-        return void setBacktrack(context, 2 | Backtrack.unescapable, context.position - context.range);
+    ([[{ value: host }, { value: account }]], input, output) => {
+      if (input.source[input.position] === '#') {
+        assert(input.source[input.position - input.range] === '@');
+        return void setBacktrack(input, 2 | Backtrack.unescapable, input.position - input.range);
       }
-      return new List([
+      return output.append(
         new Node(define(
           parse(
             new List([new Node(`@${host}${account}`)]),
             new List([new Node(host ? `https://${host}@${account}` : `/@${account}`)]),
-            context),
+            input),
           { class: 'account' }))
-      ]);
-    }))));
+      );
+    })))));

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

@@ -1,7 +1,6 @@
 import { autolink } from '../autolink';
 import { some } from '../../../combinator';
-import { input } from '../../../combinator/data/parser';
-import { Context } from '../../context';
+import { input } from '../../context';
 import { inspect } from '../../../debug.test';
 
 describe('Unit: parser/inline/autolink/anchor', () => {
@@ -9,29 +8,29 @@ describe('Unit: parser/inline/autolink/anchor', () => {
     const parser = some(autolink);
 
     it('invalid', () => {
-      assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('>', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('>>', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('>>-0', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('>>01#', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('>>01@', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('>>0-1:2', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('>>https://host', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('>>tel:1234567890', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('>>>', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('a>>0', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input(' >>0', new Context())), undefined);
+      assert.deepStrictEqual(inspect(parser, input('')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('>')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('>>')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('>>-0')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('>>01#')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('>>01@')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('>>0-1:2')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('>>https://host')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('>>tel:1234567890')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('>>>')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('a>>0')), undefined);
+      assert.deepStrictEqual(inspect(parser, input(' >>0')), undefined);
     });
 
     it('valid', () => {
-      assert.deepStrictEqual(inspect(parser, input('>>0', new Context())), [['<a class="anchor" href="?at=0">&gt;&gt;0</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('>>a', new Context())), [['<a class="anchor" href="?at=a">&gt;&gt;a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('>>A', new Context())), [['<a class="anchor" href="?at=A">&gt;&gt;A</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('>>0-', new Context())), [['<a class="anchor" href="?at=0">&gt;&gt;0</a>'], '-']);
-      assert.deepStrictEqual(inspect(parser, input('>>0-a', new Context())), [['<a class="anchor" href="?at=0-a">&gt;&gt;0-a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('>>0-A', new Context())), [['<a class="anchor" href="?at=0-A">&gt;&gt;0-A</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('>>0--a', new Context())), [['<a class="anchor" href="?at=0">&gt;&gt;0</a>'], '--a']);
-      assert.deepStrictEqual(inspect(parser, input('>>2000-0131-2359-59999', new Context())), [['<a class="anchor" href="?at=2000-0131-2359-59999">&gt;&gt;2000-0131-2359-59999</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('>>0')), [['<a class="anchor" href="?at=0">&gt;&gt;0</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('>>a')), [['<a class="anchor" href="?at=a">&gt;&gt;a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('>>A')), [['<a class="anchor" href="?at=A">&gt;&gt;A</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('>>0-')), [['<a class="anchor" href="?at=0">&gt;&gt;0</a>'], '-']);
+      assert.deepStrictEqual(inspect(parser, input('>>0-a')), [['<a class="anchor" href="?at=0-a">&gt;&gt;0-a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('>>0-A')), [['<a class="anchor" href="?at=0-A">&gt;&gt;0-A</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('>>0--a')), [['<a class="anchor" href="?at=0">&gt;&gt;0</a>'], '--a']);
+      assert.deepStrictEqual(inspect(parser, input('>>2000-0131-2359-59999')), [['<a class="anchor" href="?at=2000-0131-2359-59999">&gt;&gt;2000-0131-2359-59999</a>'], '']);
     });
 
   });

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
-import { List, Node } from '../../../combinator/data/parser';
-import { state, constraint, surround, lazy } from '../../../combinator';
+import { List, Node } from '../../../combinator/parser';
+import { state, constraint, backtrack, surround, lazy } from '../../../combinator';
 import { parse } from '../link';
 import { str } from '../../source';
 import { define } from 'typed-dom/dom';
@@ -17,17 +17,16 @@ import { define } from 'typed-dom/dom';
 // 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
 
 export const anchor: AutolinkParser.AnchorParser = lazy(() => constraint(State.autolink, state(State.autolink,
-  surround(
+  backtrack(surround(
     /(?<![0-9a-z@#])>>/yi,
     str(/[0-9a-z]+(?:-[0-9a-z]+)*(?![_.-]?[0-9a-z@#]|>>|:\S)/yi),
     '',
     false,
     [3 | Backtrack.unescapable],
-    ([, [{ value }]], context) =>
-      new List([
+    ([, [{ value }]], input, output) =>
+      output.append(
         new Node(define(parse(
           new List([new Node(`>>${value}`)]),
           new List([new Node(`?at=${value}`)]),
-          context),
-          { class: 'anchor' }))
-      ])))));
+          input),
+          { class: 'anchor' }))))))));

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

@@ -1,7 +1,6 @@
 import { autolink } from '../autolink';
 import { some } from '../../../combinator';
-import { input } from '../../../combinator/data/parser';
-import { Context } from '../../context';
+import { input } from '../../context';
 import { inspect } from '../../../debug.test';
 
 describe('Unit: parser/inline/autolink/channel', () => {
@@ -9,22 +8,22 @@ describe('Unit: parser/inline/autolink/channel', () => {
     const parser = some(autolink);
 
     it('invalid', () => {
-      assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a@', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a@b', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a#', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a#1', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a#b@', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('@a#1@b', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input(' @a#b', new Context())), undefined);
+      assert.deepStrictEqual(inspect(parser, input('')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a@')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a@b')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a#')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a#1')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a#b@')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('@a#1@b')), undefined);
+      assert.deepStrictEqual(inspect(parser, input(' @a#b')), undefined);
     });
 
     it('valid', () => {
-      assert.deepStrictEqual(inspect(parser, input('@a#b', new Context())), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('@a#b#', new Context())), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '#']);
-      assert.deepStrictEqual(inspect(parser, input('@a#b#1', new Context())), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '#1']);
-      assert.deepStrictEqual(inspect(parser, input('@a#b#c', new Context())), [['<a class="channel" href="/@a?ch=b+c">@a#b#c</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('@domain/a#b', new Context())), [['<a class="channel" href="https://domain/@a?ch=b" target="_blank">@domain/a#b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('@a#b')), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('@a#b#')), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '#']);
+      assert.deepStrictEqual(inspect(parser, input('@a#b#1')), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '#1']);
+      assert.deepStrictEqual(inspect(parser, input('@a#b#c')), [['<a class="channel" href="/@a?ch=b+c">@a#b#c</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('@domain/a#b')), [['<a class="channel" href="https://domain/@a?ch=b" target="_blank">@domain/a#b</a>'], '']);
     });
 
   });