securemark 0.292.0 → 0.293.0

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

@@ -3,16 +3,17 @@ import { union, some, block, validate, rewrite, convert, lazy, fmap } from '../.
 import { math } from '../../inline/math';
 import { autolink } from '../../inline/autolink';
 import { linebreak, unescsource, anyline } from '../../source';
+import { linearize } from '../../util';
 import { html, defrag } from 'typed-dom/dom';
 
-export const syntax = /^>+[^\S\n]/;
+export const syntax = />+[^\S\n]/y;
 
 export const quote: ReplyParser.QuoteParser = lazy(() => block(fmap(validate(
   '>',
   rewrite(
     some(validate(syntax, anyline)),
-    convert(
-      source => source.replace(/(?<=^>+[^\S\n])/mg, '\r').replace(/\n$/, ''),
+    linearize(convert(
+      source => source.replace(/(?<=^>+[^\S\n])/mg, '\r'),
       some(union([
         // quote補助関数が残した数式をパースする。
         math,
@@ -20,7 +21,7 @@ export const quote: ReplyParser.QuoteParser = lazy(() => block(fmap(validate(
         linebreak,
         unescsource,
       ])),
-      false))),
+      false), -1))),
   (ns: [string, ...(string | HTMLElement)[]]) => [
     html('span', { class: 'quote' }, defrag(ns)),
     html('br'),

package/src/parser/block/reply.ts

@@ -4,11 +4,11 @@ import { cite, syntax as csyntax } from './reply/cite';
 import { quote, syntax as qsyntax } from './reply/quote';
 import { inline } from '../inline';
 import { anyline } from '../source';
-import { lineable } from '../util';
+import { linearize } from '../util';
 import { visualize, trimBlankNodeEnd } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 
-const delimiter = new RegExp(`${csyntax.source}|${qsyntax.source}`);
+const delimiter = new RegExp(`${csyntax.source}|${qsyntax.source}`, 'y');
 
 export const reply: ReplyParser = block(validate(csyntax, fmap(
   some(union([
@@ -16,6 +16,6 @@ export const reply: ReplyParser = block(validate(csyntax, fmap(
     quote,
     rewrite(
       some(anyline, delimiter),
-      visualize(lineable(some(inline), 1))),
+      visualize(linearize(some(inline), 1))),
   ])),
   ns => [html('p', trimBlankNodeEnd(defrag(ns)))])));

package/src/parser/block/sidefence.ts

@@ -7,7 +7,7 @@ import { invalid } from '../util';
 import { html, define, defrag } from 'typed-dom/dom';
 
 export const sidefence: SidefenceParser = lazy(() => block(fmap(focus(
-  /^(?=\|+(?:[^\S\n]|\n\|))(?:\|+(?:[^\S\n][^\n]*)?(?:$|\n))+$/,
+  /(?=\|+(?:[^\S\n]|\n\|))(?:\|+(?:[^\S\n][^\n]*)?(?:$|\n))+$/y,
   union([source]), false),
   ([el]) => [
     define(el, {
@@ -16,13 +16,13 @@ export const sidefence: SidefenceParser = lazy(() => block(fmap(focus(
     }),
   ])));
 
-const opener = /^(?=\|\|+(?:$|\s))/;
+const opener = /(?=\|\|+(?:$|\s))/y;
 const unindent = (source: string) => source.replace(/(?<=^|\n)\|(?:[^\S\n]|(?=\|*(?:$|\s)))|\n$/g, '');
 
 const source: SidefenceParser.SourceParser = lazy(() => fmap(
   some(recursion(Recursion.block, union([
     focus(
-      /^(?:\|\|+(?:[^\S\n][^\n]*)?(?:$|\n))+/,
+      /(?:\|\|+(?:[^\S\n][^\n]*)?(?:$|\n))+/y,
       convert(unindent, source, false, true), false),
     rewrite(
       some(contentline, opener),

package/src/parser/block/table.ts

@@ -13,7 +13,7 @@ import AlignParser = TableParser.AlignParser;
 import CellParser = TableParser.CellParser;
 
 export const table: TableParser = lazy(() => block(fmap(validate(
-  /^\|[^\n]*(?:\n\|[^\n]*){2}/,
+  /\|[^\n]*(?:\n\|[^\n]*){2}/y,
   sequence([
     row(some(head), true),
     row(some(align), false),
@@ -27,7 +27,7 @@ export const table: TableParser = lazy(() => block(fmap(validate(
   ])));
 
 const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean): RowParser<P> => fallback(fmap(
-  line(surround(/^(?=\|)/, some(union([parser])), /^[|\\]?\s*$/, optional)),
+  line(surround(/(?=\|)/y, some(union([parser])), /[|\\]?\s*$/y, optional)),
   es => [html('tr', es)]),
   rewrite(contentline, ({ context: { source } }) => [[
     html('tr', {
@@ -39,22 +39,22 @@ const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean):
 const align: AlignParser = fmap(open(
   '|',
   union([
-    focus(/^:-+:?/, ({ context: { source } }) =>
+    focus(/:-+:?/y, ({ context: { source } }) =>
       [[source.at(-1) === ':' ? 'center' : 'start']], false),
-    focus(/^-+:?/, ({ context: { source } }) =>
+    focus(/-+:?/y, ({ context: { source } }) =>
       [[source.at(-1) === ':' ? 'end' : '']], false),
   ])),
   ns => [html('td', defrag(ns))]);
 
 const cell: CellParser = surround(
-  /^\|\s*(?=\S)/,
+  /\|\s*(?=\S)/y,
   trimStart(union([
-    close(medialink, /^\s*(?=\||$)/),
-    close(media, /^\s*(?=\||$)/),
-    close(shortmedia, /^\s*(?=\||$)/),
-    trimBlank(some(inline, /^\|/, [[/^[|\\]?\s*$/, 9]])),
+    close(medialink, /\s*(?=\||$)/y),
+    close(media, /\s*(?=\||$)/y),
+    close(shortmedia, /\s*(?=\||$)/y),
+    trimBlank(some(inline, /\|/y, [[/[|\\]?\s*$/y, 9]])),
   ])),
-  /^[^|]*/, true);
+  /[^|]*/y, true);
 
 const head: CellParser.HeadParser = fmap(
   cell,

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

@@ -19,6 +19,7 @@ describe('Unit: parser/block/ulist', () => {
       assert.deepStrictEqual(inspect(parser('-[ ]'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('-[x]'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('-\n'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('-\n- a'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' - '), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('+'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('*'), ctx), undefined);
@@ -36,23 +37,23 @@ describe('Unit: parser/block/ulist', () => {
 
     it('multiple', () => {
       // pending
-      assert.deepStrictEqual(inspect(parser('-\n-'), ctx), [['<ul><li></li><li></li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- \n-'), ctx), [['<ul><li></li><li></li></ul>'], '']);
       // filled
       assert.deepStrictEqual(inspect(parser('- 1\n- 2'), ctx), [['<ul><li id="index::1">1</li><li id="index::2">2</li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- 1\n- 2\n- 3'), ctx), [['<ul><li id="index::1">1</li><li id="index::2">2</li><li id="index::3">3</li></ul>'], '']);
       // invalid
-      assert.deepStrictEqual(inspect(parser('-\n+'), ctx), [['<ul><li></li><li id="index::+"><span class="invalid">+</span></li></ul>'], '']);
-      assert.deepStrictEqual(inspect(parser('-\n0'), ctx), [['<ul><li></li><li id="index::0"><span class="invalid">0</span></li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- \n+'), ctx), [['<ul><li></li><li id="index::+"><span class="invalid">+</span></li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- \n0'), ctx), [['<ul><li></li><li id="index::0"><span class="invalid">0</span></li></ul>'], '']);
     });
 
     it('nest', () => {
-      assert.deepStrictEqual(inspect(parser('-\n -'), ctx), [['<ul><li><br><ul><li></li></ul></li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- \n -'), ctx), [['<ul><li><br><ul><li></li></ul></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- 1\n - 2'), ctx), [['<ul><li id="index::1">1<ul><li id="index::2">2</li></ul></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- 1\n - 2\n- 3'), ctx), [['<ul><li id="index::1">1<ul><li id="index::2">2</li></ul></li><li id="index::3">3</li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- 1\n - 2\n - 3'), ctx), [['<ul><li id="index::1">1<ul><li id="index::2">2</li><li id="index::3">3</li></ul></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- 1\n - 2\n  - 3'), ctx), [['<ul><li id="index::1">1<ul><li id="index::2">2<ul><li id="index::3">3</li></ul></li></ul></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- 1\n  - 2\n - 3'), ctx), [['<ul><li id="index::1">1<ul><li id="index::2">2</li></ul></li><li id="index::-_3"><span class="invalid"> - 3</span></li></ul>'], '']);
-      assert.deepStrictEqual(inspect(parser('-\n -\n +\n -\n +\n+'), ctx), [['<ul><li><br><ul><li></li><li id="index::+"><span class="invalid">+</span></li><li></li><li id="index::+"><span class="invalid">+</span></li></ul></li><li id="index::+"><span class="invalid">+</span></li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- \n -\n +\n -\n +\n+'), ctx), [['<ul><li><br><ul><li></li><li id="index::+"><span class="invalid">+</span></li><li></li><li id="index::+"><span class="invalid">+</span></li></ul></li><li id="index::+"><span class="invalid">+</span></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- 1\n + 2'), ctx), [['<ul><li id="index::1">1<ul class="invalid"><li>2</li></ul></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- 1\n 0'), ctx), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- 1\n 0.'), ctx), [['<ul><li id="index::1">1<ol><li></li></ol></li></ul>'], '']);
@@ -71,10 +72,10 @@ describe('Unit: parser/block/ulist', () => {
     });
 
     it('indexer', () => {
-      assert.deepStrictEqual(inspect(parser('- [|a]'), ctx), [['<ul><li id="index::[|a]">[|a]</li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- [|a]'), ctx), [['<ul><li id="index::[|a]"><span class="invalid">[|a]</span></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- a [|]'), ctx), [['<ul><li>a<span class="indexer" data-index=""></span></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- a [|b]'), ctx), [['<ul><li id="index::b">a<span class="indexer" data-index="b"></span></li></ul>'], '']);
-      assert.deepStrictEqual(inspect(parser('- [ ] [|a]'), ctx), [['<ul class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span>[|a]</li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- [ ] [|a]'), ctx), [['<ul class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span><span class="invalid">[|a]</span></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- [ ] a [|b]'), ctx), [['<ul class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- a [|]\n - c [|d]'), ctx), [['<ul><li>a<span class="indexer" data-index=""></span><ul><li id="index::d">c<span class="indexer" data-index="d"></span></li></ul></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- a [|b]\n - c [|d]'), ctx), [['<ul><li id="index::b">a<span class="indexer" data-index="b"></span><ul><li id="index::d">c<span class="indexer" data-index="d"></span></li></ul></li></ul>'], '']);

package/src/parser/block/ulist.ts

@@ -4,23 +4,23 @@ import { union, inits, subsequence, some, recursion, block, line, validate, inde
 import { olist_ } from './olist';
 import { ilist_, ilistitem } from './ilist';
 import { inline, indexer, indexee, dataindex } from '../inline';
-import { lineable } from '../util';
+import { linearize } from '../util';
 import { visualize, trimBlank } from '../visibility';
 import { unshift } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
 export const ulist: UListParser = lazy(() => block(validate(
-  /^-(?=[^\S\n]|\n[^\S\n]*\S)/,
+  /- /y,
   ulist_)));
 
 export const ulist_: UListParser = lazy(() => block(fmap(validate(
-  /^-(?=$|\s)/,
+  /-(?=$|[ \n])/y,
   some(recursion(Recursion.listitem, union([
     indexee(fmap(fallback(
       inits([
-        line(open(/^-(?:$|\s)/, subsequence([
+        line(open(/-(?:$|[ \n])/y, subsequence([
           checkbox,
-          trim(visualize(lineable(trimBlank(some(union([indexer, inline])))))),
+          trim(visualize(linearize(trimBlank(some(union([indexer, inline]))), - 1))),
         ]), true)),
         indent(union([ulist_, olist_, ilist_])),
       ]),
@@ -30,7 +30,7 @@ export const ulist_: UListParser = lazy(() => block(fmap(validate(
   es => [format(html('ul', es))])));
 
 export const checkbox = focus(
-  /^\[[xX ]\](?=$|\s)/,
+  /\[[xX ]\](?=$|[ \n])/y,
   ({ context: { source } }) => [[
     html('span', { class: 'checkbox' }, source[1].trimStart() ? '☑' : '☐'),
   ]]);

package/src/parser/block.ts

@@ -42,7 +42,7 @@ export const block: BlockParser = reset(
   {
     resources: {
       // バックトラックのせいで文字数制限を受けないようにする。
-      clock: MAX_SEGMENT_SIZE * 1,
+      clock: MAX_SEGMENT_SIZE * 5 + 1,
       recursions: [
         10 || Recursion.block,
         20 || Recursion.blockquote,
@@ -55,23 +55,56 @@ export const block: BlockParser = reset(
     backtracks: {},
   },
   error(union([
+    input => {
+      const { context: { source, position } } = input;
+      if (position === source.length) return;
+      switch (source.slice(position, position + 3)) {
+        case '===':
+          return pagebreak(input);
+        case '~~~':
+          return extension(input);
+      }
+      switch (source.slice(position, position + 2)) {
+        case '$$':
+          return mathblock(input);
+        case '[$':
+          return extension(input);
+        case '[!':
+          return mediablock(input);
+        case '!>':
+          return blockquote(input);
+        case '>>':
+          return blockquote(input)
+              || reply(input);
+        case '- ':
+          return ulist(input)
+              || ilist(input);
+        case '+ ':
+        case '* ':
+          return ilist(input);
+        case '~ ':
+          return dlist(input);
+      }
+      switch (source[position]) {
+        case '#':
+          return heading(input);
+        case '|':
+          return table(input)
+              || sidefence(input);
+        case '`':
+          return codeblock(input);
+        case '$':
+          return extension(input);
+        case '>':
+          return blockquote(input);
+        case '!':
+          return mediablock(input);
+      }
+    },
     emptyline,
-    pagebreak,
-    heading,
-    ulist,
     olist,
-    ilist,
-    dlist,
-    table,
-    codeblock,
-    mathblock,
-    extension,
-    sidefence,
-    blockquote,
-    mediablock,
-    reply,
     paragraph
-  ])));
+  ]) as any));
 
 function error(parser: BlockParser): BlockParser {
   const reg = new RegExp(String.raw`^${Command.Error}.*\n`)

package/src/parser/header.ts

@@ -7,7 +7,7 @@ import { normalize } from './api/normalize';
 import { html, defrag } from 'typed-dom/dom';
 
 export const header: MarkdownParser.HeaderParser = lazy(() => validate(
-  /^---+[^\S\v\f\r\n]*\r?\n[^\S\n]*(?=\S)/,
+  /---+[^\S\v\f\r\n]*\r?\n[^\S\n]*(?=\S)/y,
   inits([
     rewrite(
       ({ context }) => {
@@ -23,7 +23,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
       block(
         union([
           validate(({ context }) => context.header ?? true,
-          focus(/^---[^\S\v\f\r\n]*\r?\n(?:[A-Za-z][0-9A-Za-z]*(?:-[A-Za-z][0-9A-Za-z]*)*:[ \t]+\S[^\v\f\r\n]*\r?\n){1,100}---[^\S\v\f\r\n]*(?:$|\r?\n)/,
+          focus(/---[^\S\v\f\r\n]*\r?\n(?:[A-Za-z][0-9A-Za-z]*(?:-[A-Za-z][0-9A-Za-z]*)*:[ \t]+\S[^\v\f\r\n]*\r?\n){1,100}---[^\S\v\f\r\n]*(?:$|\r?\n)/y,
           convert(source =>
             normalize(source.slice(source.indexOf('\n') + 1, source.trimEnd().lastIndexOf('\n'))).replace(/(\S)\s+$/mg, '$1'),
             fmap(
@@ -48,7 +48,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
             ]];
           },
         ]))),
-    clear(str(/^[^\S\v\f\r\n]*\r?\n/)),
+    clear(str(/[^\S\v\f\r\n]*\r?\n/y)),
   ])));
 
 const field: MarkdownParser.HeaderParser.FieldParser = line(({ context: { source, position } }) => {

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

@@ -16,14 +16,15 @@ describe('Unit: parser/inline/autolink/account', () => {
       assert.deepStrictEqual(inspect(parser('@-'), ctx), [['@'], '-']);
       assert.deepStrictEqual(inspect(parser('@.'), ctx), [['@'], '.']);
       assert.deepStrictEqual(inspect(parser('@0'), ctx), [['@0'], '']);
-      assert.deepStrictEqual(inspect(parser('@a@'), ctx), [['@a@'], '']);
-      assert.deepStrictEqual(inspect(parser('@a@b'), ctx), [['@a@b'], '']);
-      assert.deepStrictEqual(inspect(parser('@a@b@c'), ctx), [['@a@b@c'], '']);
-      assert.deepStrictEqual(inspect(parser('@ab@'), ctx), [['@ab@'], '']);
-      assert.deepStrictEqual(inspect(parser('@a@b'), ctx), [['@a@b'], '']);
+      assert.deepStrictEqual(inspect(parser('@a@'), ctx), [['@a'], '@']);
+      assert.deepStrictEqual(inspect(parser('@a@b'), ctx), [['@a'], '@b']);
+      assert.deepStrictEqual(inspect(parser('@a@b@c'), ctx), [['@a'], '@b@c']);
+      assert.deepStrictEqual(inspect(parser('@ab@'), ctx), [['@ab'], '@']);
       assert.deepStrictEqual(inspect(parser('@@'), ctx), [['@@'], '']);
       assert.deepStrictEqual(inspect(parser('@@a'), ctx), [['@@a'], '']);
       assert.deepStrictEqual(inspect(parser('@@@a'), ctx), [['@@@a'], '']);
+      assert.deepStrictEqual(inspect(parser('@#'), ctx), [['@', '#'], '']);
+      assert.deepStrictEqual(inspect(parser('@#a'), ctx), [['@', '<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
       assert.deepStrictEqual(inspect(parser(' @a'), ctx), undefined);
     });
 
@@ -37,8 +38,8 @@ describe('Unit: parser/inline/autolink/account', () => {
       assert.deepStrictEqual(inspect(parser('@a--b'), ctx), [['<a class="account" href="/@a">@a</a>'], '--b']);
       assert.deepStrictEqual(inspect(parser('@a.'), ctx), [['<a class="account" href="/@a">@a</a>'], '.']);
       assert.deepStrictEqual(inspect(parser('@a.domain.com'), ctx), [['<a class="account" href="/@a.domain.com">@a.domain.com</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('@http://host'), ctx), [['<a class="account" href="/@http">@http</a>'], '://host']);
-      assert.deepStrictEqual(inspect(parser('@ttp://host'), ctx), [['<a class="account" href="/@ttp">@ttp</a>'], '://host']);
+      assert.deepStrictEqual(inspect(parser('@http://host'), ctx), [['@http'], '://host']);
+      assert.deepStrictEqual(inspect(parser('@ttp://host'), ctx), [ [ '@ttp' ], '://host' ]);
       assert.deepStrictEqual(inspect(parser('@domain/a'), ctx), [['<a class="account" href="https://domain/@a" target="_blank">@domain/a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('@domain.com/a'), ctx), [['<a class="account" href="https://domain.com/@a" target="_blank">@domain.com/a</a>'], '']);
     });

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

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../../inline';
-import { State } from '../../context';
+import { State, Backtrack } from '../../context';
 import { union, tails, state, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
@@ -9,17 +9,20 @@ import { define } from 'typed-dom/dom';
 
 export const account: AutolinkParser.AccountParser = lazy(() => rewrite(
   open(
-    '@',
+    /(?<![0-9a-z])@/yi,
     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),
-    ])),
+      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])?)*\//yi),
+      str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![0-9a-z@#]|>>|:\S)/yi),
+    ]),
+    false,
+    [3 | Backtrack.autolink]),
   union([
     constraint(State.autolink, state(State.autolink, fmap(convert(
       source =>
-        `[${source}]{ ${source.includes('/')
-          ? `https://${source.slice(1).replace('/', '/@')}`
-          : `/${source}`
+        `[${source}]{ ${
+          source.includes('/')
+            ? `https://${source.slice(1).replace('/', '/@')}`
+            : `/${source}`
         } }`,
       unsafelink,
       false),

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

@@ -18,7 +18,7 @@ describe('Unit: parser/inline/autolink/anchor', () => {
       assert.deepStrictEqual(inspect(parser('>>https://host'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>>tel:1234567890'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>>>'), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('a>>0'), ctx), [['a>>0'], '']);
+      assert.deepStrictEqual(inspect(parser('a>>0'), ctx), [['a'], '>>0']);
       assert.deepStrictEqual(inspect(parser(' >>0'), ctx), undefined);
     });
 

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

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

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

@@ -10,19 +10,19 @@ describe('Unit: parser/inline/autolink/channel', () => {
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('@a@'), ctx), [['@a@'], '']);
-      assert.deepStrictEqual(inspect(parser('@a@b'), ctx), [['@a@b'], '']);
-      assert.deepStrictEqual(inspect(parser('@a#'), ctx), [['@a#'], '']);
-      assert.deepStrictEqual(inspect(parser('@a#1'), ctx), [['@a#1'], '']);
-      assert.deepStrictEqual(inspect(parser('@a#b@'), ctx), [['@a#b@'], '']);
-      assert.deepStrictEqual(inspect(parser('@a#1@b'), ctx), [['@a#1@b'], '']);
-      assert.deepStrictEqual(inspect(parser('@a#b#'), ctx), [['@a#b#'], '']);
-      assert.deepStrictEqual(inspect(parser('@a#b#1'), ctx), [['@a#b#1'], '']);
+      assert.deepStrictEqual(inspect(parser('@a@'), ctx), [['@a'], '@']);
+      assert.deepStrictEqual(inspect(parser('@a@b'), ctx), [['@a'], '@b']);
+      assert.deepStrictEqual(inspect(parser('@a#'), ctx), [['@a'], '#']);
+      assert.deepStrictEqual(inspect(parser('@a#1'), ctx), [['@a'], '#1']);
+      assert.deepStrictEqual(inspect(parser('@a#b@'), ctx), [['@a'], '#b@']);
+      assert.deepStrictEqual(inspect(parser('@a#1@b'), ctx), [['@a'], '#1@b']);
       assert.deepStrictEqual(inspect(parser(' @a#b'), ctx), undefined);
     });
 
     it('valid', () => {
       assert.deepStrictEqual(inspect(parser('@a#b'), ctx), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('@a#b#'), ctx), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '#']);
+      assert.deepStrictEqual(inspect(parser('@a#b#1'), ctx), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '#1']);
       assert.deepStrictEqual(inspect(parser('@a#b#c'), ctx), [['<a class="channel" href="/@a?ch=b+c">@a#b#c</a>'], '']);
       assert.deepStrictEqual(inspect(parser('@domain/a#b'), ctx), [['<a class="channel" href="https://domain/@a?ch=b" target="_blank">@domain/a#b</a>'], '']);
     });

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

@@ -1,22 +1,47 @@
 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 { stringify } from '../../util';
+import { State, Backtrack } from '../../context';
+import { union, tails, sequence, some, state, constraint, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { unsafelink } from '../link';
+import { emoji } from './hashtag';
+import { str } from '../../source';
 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('@',
-  constraint(State.autolink, bind(
+export const channel: AutolinkParser.ChannelParser = lazy(() => rewrite(
   sequence([
-    account,
-    some(hashtag),
+    open(
+      /(?<![0-9a-z])@/yi,
+      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])?)*\//yi),
+        str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![0-9a-z@]|>>|:\S)/yi),
+      ]),
+      false,
+      [3 | Backtrack.autolink]),
+    some(open(
+      '#',
+      verify(
+        str(new RegExp([
+          /(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji))+(?![0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
+        ].join('').replace(/emoji/g, emoji), 'yu')),
+        ([source]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(source)),
+      false,
+      [3 | Backtrack.autolink])),
   ]),
-  (es: [HTMLAnchorElement]) => {
-    const source = stringify(es);
-    const el = es[0];
-    const url = `${el.getAttribute('href')}?ch=${source.slice(source.indexOf('#') + 1).replace(/#/g, '+')}`;
-    return [[define(el, { class: 'channel', href: url }, source)]];
-  })));
+  union([
+    constraint(State.autolink, state(State.autolink, fmap(convert(
+      source =>
+        `[${source}]{ ${
+          source.includes('/')
+            ? `https://${source.slice(1, source.indexOf('#')).replace('/', '/@')}`
+            : `/${source.slice(0, source.indexOf('#'))}`
+        } }`,
+      unsafelink,
+      false),
+      ([el], { source, position, range = 0 }) => {
+        const src = source.slice(position - range, position);
+        const url = `${el.getAttribute('href')}?ch=${src.slice(src.indexOf('#') + 1).replace(/#/g, '+')}`;
+        return [define(el, { class: 'channel', href: url }, src)];
+      }))),
+    ({ context: { source } }) => [[source]],
+  ])));

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

@@ -10,23 +10,25 @@ describe('Unit: parser/inline/autolink/email', () => {
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('a@'), ctx), [['a@'], '']);
-      assert.deepStrictEqual(inspect(parser('a@+'), ctx), [['a@'], '+']);
-      assert.deepStrictEqual(inspect(parser('a@_'), ctx), [['a@'], '_']);
-      assert.deepStrictEqual(inspect(parser('a@-'), ctx), [['a@'], '-']);
-      assert.deepStrictEqual(inspect(parser('a@.'), ctx), [['a@'], '.']);
-      assert.deepStrictEqual(inspect(parser('a@b@'), ctx), [['a@b@'], '']);
-      assert.deepStrictEqual(inspect(parser('a@bc@'), ctx), [['a@bc@'], '']);
-      assert.deepStrictEqual(inspect(parser('a@b@c'), ctx), [['a@b@c'], '']);
-      assert.deepStrictEqual(inspect(parser('a@b#'), ctx), [['a@b#'], '']);
-      assert.deepStrictEqual(inspect(parser('a@b#1'), ctx), [['a@b#1'], '']);
-      assert.deepStrictEqual(inspect(parser('a@@'), ctx), [['a@@'], '']);
-      assert.deepStrictEqual(inspect(parser('a@@b'), ctx), [['a@@b'], '']);
+      assert.deepStrictEqual(inspect(parser('a@'), ctx), [['a'], '@']);
+      assert.deepStrictEqual(inspect(parser('a@+'), ctx), [['a'], '@+']);
+      assert.deepStrictEqual(inspect(parser('a@_'), ctx), [['a'], '@_']);
+      assert.deepStrictEqual(inspect(parser('a@-'), ctx), [['a'], '@-']);
+      assert.deepStrictEqual(inspect(parser('a@.'), ctx), [['a'], '@.']);
+      assert.deepStrictEqual(inspect(parser('a@b@'), ctx), [['a'], '@b@']);
+      assert.deepStrictEqual(inspect(parser('a@bc@'), ctx), [['a'], '@bc@']);
+      assert.deepStrictEqual(inspect(parser('a@b@c'), ctx), [['a'], '@b@c']);
+      assert.deepStrictEqual(inspect(parser('a@b#'), ctx), [['a'], '@b#']);
+      assert.deepStrictEqual(inspect(parser('a@b#1'), ctx), [['a'], '@b#1']);
+      assert.deepStrictEqual(inspect(parser('a@@'), ctx), [['a@', '@'], '']);
+      assert.deepStrictEqual(inspect(parser('a@@b'), ctx), [['a@', '<a class="account" href="/@b">@b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('a+@b'), ctx), [['a'], '+@b']);
       assert.deepStrictEqual(inspect(parser('a__b@c'), ctx), [['a'], '__b@c']);
       assert.deepStrictEqual(inspect(parser('a..b@c'), ctx), [['a'], '..b@c']);
       assert.deepStrictEqual(inspect(parser('a++b@c'), ctx), [['a'], '++b@c']);
-      assert.deepStrictEqual(inspect(parser(`a@${'b'.repeat(64)}`), ctx), [[`a@${'b'.repeat(64)}`], '']);
+      assert.deepStrictEqual(inspect(parser('a@http://host'), ctx), [['a'], '@http://host']);
+      assert.deepStrictEqual(inspect(parser('a@ttp://host'), ctx), [['a'], '@ttp://host']);
+      assert.deepStrictEqual(inspect(parser(`a@${'b'.repeat(64)}`), ctx), [['a'], `@${'b'.repeat(64)}`]);
       assert.deepStrictEqual(inspect(parser(' a@b'), ctx), undefined);
     });
 
@@ -44,8 +46,6 @@ describe('Unit: parser/inline/autolink/email', () => {
       assert.deepStrictEqual(inspect(parser('a@b.'), ctx), [['<a class="email" href="mailto:a@b">a@b</a>'], '.']);
       assert.deepStrictEqual(inspect(parser('a@b.c'), ctx), [['<a class="email" href="mailto:a@b.c">a@b.c</a>'], '']);
       assert.deepStrictEqual(inspect(parser('a@b..c'), ctx), [['<a class="email" href="mailto:a@b">a@b</a>'], '..c']);
-      assert.deepStrictEqual(inspect(parser('a@http://host'), ctx), [['<a class="email" href="mailto:a@http">a@http</a>'], '://host']);
-      assert.deepStrictEqual(inspect(parser('a@ttp://host'), ctx), [['<a class="email" href="mailto:a@ttp">a@ttp</a>'], '://host']);
       assert.deepStrictEqual(inspect(parser('ab+cd@0'), ctx), [['<a class="email" href="mailto:ab+cd@0">ab+cd@0</a>'], '']);
     });