securemark 0.292.0 → 0.293.1

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);
+        case '```':
+          return codeblock(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 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/context.ts

@@ -28,10 +28,10 @@ export const enum Recursion {
 }
 
 export const enum Backtrack {
-  link = 1 << 6,
-  ruby = 1 << 5,
-  doublebracket = 1 << 4,
-  bracket = 1 << 3,
+  bracket = 1 << 6,
+  doublebracket = 1 << 5,
+  link = 1 << 4,
+  ruby = 1 << 3,
   escbracket = 1 << 2,
   autolink = 0 << 2,
 }

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/annotation.ts

@@ -16,4 +16,4 @@ export const annotation: AnnotationParser = lazy(() => constraint(State.annotati
       ? [[html('sup', { class: 'annotation' }, [html('span', defrag(trimBlankNodeEnd(ns)))])]]
       : undefined,
   undefined,
-  [3 | Backtrack.doublebracket, 1 | Backtrack.bracket])));
+  [1 | Backtrack.bracket, 3 | Backtrack.doublebracket])));

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>'], '']);
     });
 

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

@@ -1,19 +1,17 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
-import { union, state, constraint, verify, rewrite, surround } from '../../../combinator';
+import { union, state, constraint, verify, rewrite, open } from '../../../combinator';
 import { str } from '../../source';
 import { html } from 'typed-dom/dom';
 
 // https://html.spec.whatwg.org/multipage/input.html
 
 export const email: AutolinkParser.EmailParser = rewrite(
-  surround(
-    str(/^[0-9a-z]/i),
+  open(/(?<![0-9a-z][_.+-]?)(?=[0-9a-z])/yi,
     verify(
-      str(/^(?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z])/i),
-      ([source]) => source.length <= 255 - 1),
-    '',
-    false, undefined, undefined,
+      str(/[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z@#]|>>|:\S)/yi),
+      ([source]) => source.length <= 255),
+    false,
     [3 | Backtrack.autolink]),
   union([
     constraint(State.autolink, state(State.autolink,

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

@@ -12,10 +12,10 @@ describe('Unit: parser/inline/autolink/hashnum', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('#'), ctx), [['#'], '']);
       assert.deepStrictEqual(inspect(parser('# '), ctx), [['#'], ' ']);
-      assert.deepStrictEqual(inspect(parser('#1#'), ctx), [['#1#'], '']);
-      assert.deepStrictEqual(inspect(parser('#1#2'), ctx), [['#1#2'], '']);
-      assert.deepStrictEqual(inspect(parser('#1#2#3'), ctx), [['#1#2#3'], '']);
-      assert.deepStrictEqual(inspect(parser('#1@2'), ctx), [['#1@2'], '']);
+      assert.deepStrictEqual(inspect(parser('#1#'), ctx), [['#1'], '#']);
+      assert.deepStrictEqual(inspect(parser('#1#2'), ctx), [['#1'], '#2']);
+      assert.deepStrictEqual(inspect(parser('#1#2#3'), ctx), [['#1'], '#2#3']);
+      assert.deepStrictEqual(inspect(parser('#1@2'), ctx), [['#1'], '@2']);
       assert.deepStrictEqual(inspect(parser('#\\'), ctx), [['#'], '\\']);
       assert.deepStrictEqual(inspect(parser('#\\ '), ctx), [['#'], '\\ ']);
       assert.deepStrictEqual(inspect(parser('#\\\n'), ctx), [['#'], '\\\n']);
@@ -28,11 +28,6 @@ describe('Unit: parser/inline/autolink/hashnum', () => {
       assert.deepStrictEqual(inspect(parser('#{#}'), ctx), [['#'], '{#}']);
       assert.deepStrictEqual(inspect(parser('#{1}'), ctx), [['#'], '{1}']);
       assert.deepStrictEqual(inspect(parser('#　'), ctx), [['#'], '　']);
-      assert.deepStrictEqual(inspect(parser('0#1'), ctx), [['0#1'], '']);
-      assert.deepStrictEqual(inspect(parser('0#a'), ctx), [['0#a'], '']);
-      assert.deepStrictEqual(inspect(parser('0##1'), ctx), [['0##1'], '']);
-      assert.deepStrictEqual(inspect(parser('0##a'), ctx), [['0##a'], '']);
-      assert.deepStrictEqual(inspect(parser('あ#1'), ctx), [['あ#1'], '']);
       assert.deepStrictEqual(inspect(parser(' #1'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(10)}`), ctx), [[`#${'1'.repeat(10)}`], '']);
       assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(10)}a`), ctx), [[`#${'1'.repeat(10)}a`], '']);

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

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../../inline';
-import { State } from '../../context';
+import { State, Backtrack } from '../../context';
 import { union, state, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { emoji } from './hashtag';
@@ -8,10 +8,14 @@ import { define } from 'typed-dom/dom';
 
 export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
   open(
-    '#',
+    new RegExp([
+      /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source,
+    ].join('').replace(/emoji/g, emoji), 'yu'),
     str(new RegExp([
-      /^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji)/u.source,
-    ].join('').replace(/emoji/, emoji), 'u'))),
+      /[0-9]{1,9}(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
+    ].join('').replace(/emoji/g, emoji), 'yu')),
+    false,
+    [1 | Backtrack.autolink]),
   union([
     constraint(State.autolink, state(State.autolink, fmap(convert(
       source => `[${source}]{ ${source.slice(1)} }`,

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

@@ -12,10 +12,12 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('#'), ctx), [['#'], '']);
       assert.deepStrictEqual(inspect(parser('# '), ctx), [['#'], ' ']);
-      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('#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('#a@b'), ctx), [['#a'], '@b']);
+      assert.deepStrictEqual(inspect(parser('#@'), ctx), [['#', '@'], '']);
+      assert.deepStrictEqual(inspect(parser('#@a'), ctx), [['#', '<a class="account" href="/@a">@a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#\\'), ctx), [['#'], '\\']);
       assert.deepStrictEqual(inspect(parser('#\\ '), ctx), [['#'], '\\ ']);
       assert.deepStrictEqual(inspect(parser('#\\\n'), ctx), [['#'], '\\\n']);
@@ -33,12 +35,8 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
       assert.deepStrictEqual(inspect(parser('#{}}'), ctx), [['#'], '{}}']);
       assert.deepStrictEqual(inspect(parser('#{#}'), ctx), [['#'], '{#}']);
       assert.deepStrictEqual(inspect(parser('#{a}'), ctx), [['#'], '{a}']);
+      assert.deepStrictEqual(inspect(parser('#12345a'), ctx), [['#12345a'], '']);
       assert.deepStrictEqual(inspect(parser('#　'), ctx), [['#'], '　']);
-      assert.deepStrictEqual(inspect(parser('a#1'), ctx), [['a#1'], '']);
-      assert.deepStrictEqual(inspect(parser('a#b'), ctx), [['a#b'], '']);
-      assert.deepStrictEqual(inspect(parser('a##1'), ctx), [['a##1'], '']);
-      assert.deepStrictEqual(inspect(parser('a##b'), ctx), [['a##b'], '']);
-      assert.deepStrictEqual(inspect(parser('あ#b'), ctx), [['あ#b'], '']);
       assert.deepStrictEqual(inspect(parser(' #a'), ctx), undefined);
     });
 
@@ -66,7 +64,8 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
       assert.deepStrictEqual(inspect(parser(`#a'0`), ctx), [[`<a class="hashtag" href="/hashtags/a'0">#a'0</a>`], '']);
       assert.deepStrictEqual(inspect(parser(`#a'_b`), ctx), [[`<a class="hashtag" href="/hashtags/a">#a</a>`], `'_b`]);
       assert.deepStrictEqual(inspect(parser(`#a_'b`), ctx), [[`<a class="hashtag" href="/hashtags/a">#a</a>`], `_'b`]);
-      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(9)}a`), ctx), [[`<a class="hashtag" href="/hashtags/${'1'.repeat(9)}a">#${'1'.repeat(9)}a</a>`], '']);
+      assert.deepStrictEqual(inspect(parser('#1234a'), ctx), [['<a class="hashtag" href="/hashtags/1234a">#1234a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('#a+b'), ctx), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '+b']);
     });
 
   });

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

@@ -1,6 +1,6 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
-import { union, state, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, state, constraint, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
 import { define } from 'typed-dom/dom';
@@ -12,11 +12,14 @@ export const emoji = String.raw`\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Em
 
 export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
   open(
-    '#',
-    str(new RegExp([
-      /^(?!['_])(?=(?:[0-9]{1,9})?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji)))/u.source,
-      /(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji))+/u.source,
-    ].join('').replace(/emoji/g, emoji), 'u')),
+    new RegExp([
+      /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source,
+    ].join('').replace(/emoji/g, emoji), 'yu'),
+    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]),
   union([