securemark 0.294.3 → 0.294.5

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

@@ -10,21 +10,24 @@ describe('Unit: parser/inline/autolink/account', () => {
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('@'), ctx), [['@'], '']);
-      assert.deepStrictEqual(inspect(parser('@+'), ctx), [['@'], '+']);
-      assert.deepStrictEqual(inspect(parser('@_'), ctx), [['@'], '_']);
-      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('@@'), 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('@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@+'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@_'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@-'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@.'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@0'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a@b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a@b@c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@ab@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@@a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@@@a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@#a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a.b:c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a.domain.com:b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@http://host'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' @a'), ctx), undefined);
     });
 
@@ -38,8 +41,6 @@ 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), [['@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,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { union, tails, state, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, state, constraint, rewrite, surround, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
 import { define } from 'typed-dom/dom';
@@ -9,24 +9,18 @@ import { define } from 'typed-dom/dom';
 // https://example/@user must be a user page or a redirect page going there.
 
 export const account: AutolinkParser.AccountParser = lazy(() => rewrite(
-  open(
+  surround(
     /(?<![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,
+    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),
+    true, undefined, undefined,
     [3 | Backtrack.autolink]),
-  union([
-    constraint(State.autolink, state(State.autolink, fmap(convert(
-      source =>
-        `[${source}]{ ${
-          source.includes('/')
-            ? `https://${source.slice(1).replace('/', '/@')}`
-            : `/${source}`
-        } }`,
-      unsafelink,
-      false),
-      ([{ value }]) => new List([new Data(define(value, { class: 'account' }))])))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ])));
+  constraint(State.autolink, state(State.autolink, fmap(convert(
+    source =>
+      `[${source}]{ ${source.includes('/')
+        ? `https://${source.slice(1).replace('/', '/@')}`
+        : `/${source}`
+      } }`,
+    union([unsafelink]),
+    false),
+    ([{ value }]) => new List([new Data(define(value, { class: 'account' }))]))))));

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

@@ -15,10 +15,11 @@ describe('Unit: parser/inline/autolink/anchor', () => {
       assert.deepStrictEqual(inspect(parser('>>-0'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>>01#'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>>01@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('>>0-1:2'), ctx), undefined);
       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), undefined);
       assert.deepStrictEqual(inspect(parser(' >>0'), ctx), undefined);
     });
 

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

@@ -19,18 +19,15 @@ import { define } from 'typed-dom/dom';
 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),
+    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),
-      ([{ value }]) => new List([new Data(define(value, { class: 'anchor' }))])))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ])));
+  constraint(State.autolink, state(State.autolink, fmap(convert(
+    source =>
+      `[${source}]{ ${source.includes('/')
+        ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
+        : `?at=${source.slice(2)}`
+      } }`,
+    union([unsafelink]),
+    false),
+    ([{ value }]) => new List([new Data(define(value, { class: 'anchor' }))]))))));

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

@@ -10,12 +10,12 @@ 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@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a@b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a#1'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a#b@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a#1@b'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' @a#b'), ctx), undefined);
     });
 

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { union, tails, sequence, some, state, constraint, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, sequence, some, state, constraint, verify, rewrite, surround, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { emoji } from './hashtag';
 import { str } from '../../source';
@@ -11,38 +11,34 @@ import { define } from 'typed-dom/dom';
 
 export const channel: AutolinkParser.ChannelParser = lazy(() => rewrite(
   sequence([
-    open(
+    surround(
       /(?<![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,
+      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),
+      true, undefined, undefined,
       [3 | Backtrack.autolink]),
-    some(open(
+    some(verify(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))+(?![0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
-        ].join('').replace(/emoji/g, emoji), 'yu')),
-        ([{ value }]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)),
-      false,
-      [3 | Backtrack.autolink])),
+      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), 'yu')),
+      str(new RegExp([
+        /(?![0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
+      ].join('').replace(/emoji/g, emoji), 'yu')),
+      false, undefined, undefined,
+      [3 | Backtrack.autolink]),
+      ([{ value }]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value as string))),
   ]),
-  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),
-      ([{ value: 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 new List([new Data(define(el, { class: 'channel', href: url }, src))]);
-      }))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ])));
+  constraint(State.autolink, state(State.autolink, fmap(convert(
+    source =>
+      `[${source}]{ ${source.includes('/')
+        ? `https://${source.slice(1, source.indexOf('#')).replace('/', '/@')}`
+        : `/${source.slice(0, source.indexOf('#'))}`
+      } }`,
+    union([unsafelink]),
+    false),
+    ([{ value: 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 new List([new Data(define(el, { class: 'channel', href: url }, src))]);
+    })))));

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

@@ -10,25 +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@', '<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@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@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@+'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@_'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@-'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@.'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@b@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@bc@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@b@c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@b#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@b#1'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@@b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a+@b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a__b@c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a..b@c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a++b@c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@b.c:d'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@http://host'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`a@${'b'.repeat(64)}`), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' a@b'), ctx), undefined);
     });
 

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

@@ -8,14 +8,14 @@ import { html } from 'typed-dom/dom';
 // https://html.spec.whatwg.org/multipage/input.html
 
 export const email: AutolinkParser.EmailParser = rewrite(
-  open(/(?<![0-9a-z][_.+-]?)(?=[0-9a-z])/yi,
+  open(/(?<![0-9a-z][_.+-]?|[@#])(?=[0-9a-z])/yi,
     verify(
-      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),
+      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),
       ([{ value }]) => value.length <= 255),
     false,
     [3 | Backtrack.autolink]),
-  union([
-    constraint(State.autolink, state(State.autolink,
-      ({ context: { source } }) => new List([new Data(html('a', { class: 'email', href: `mailto:${source}` }, source))]))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ]));
+  constraint(State.autolink, state(State.autolink,
+    union([
+      ({ context: { source } }) =>
+        new List([new Data(html('a', { class: 'email', href: `mailto:${source}` }, source))])
+    ]))));

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

@@ -10,27 +10,27 @@ describe('Unit: parser/inline/autolink/hashnum', () => {
 
     it('invalid', () => {
       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('#\\'), ctx), [['#'], '\\']);
-      assert.deepStrictEqual(inspect(parser('#\\ '), ctx), [['#'], '\\ ']);
-      assert.deepStrictEqual(inspect(parser('#\\\n'), ctx), [['#'], '\\\n']);
-      assert.deepStrictEqual(inspect(parser('##'), ctx), [['##'], '']);
-      assert.deepStrictEqual(inspect(parser('##1'), ctx), [['##1'], '']);
-      assert.deepStrictEqual(inspect(parser('###1'), ctx), [['###1'], '']);
-      assert.deepStrictEqual(inspect(parser('#{}'), ctx), [['#'], '{}']);
-      assert.deepStrictEqual(inspect(parser('#{{}'), ctx), [['#'], '{{}']);
-      assert.deepStrictEqual(inspect(parser('#{}}'), ctx), [['#'], '{}}']);
-      assert.deepStrictEqual(inspect(parser('#{#}'), ctx), [['#'], '{#}']);
-      assert.deepStrictEqual(inspect(parser('#{1}'), ctx), [['#'], '{1}']);
-      assert.deepStrictEqual(inspect(parser('#　'), ctx), [['#'], '　']);
+      assert.deepStrictEqual(inspect(parser('#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('# '), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#1#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#1#2'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#1#2#3'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#1@2'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\ '), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\\n'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('##'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('##1'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('###1'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{{}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{}}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{#}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{1}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(10)}`), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(10)}a`), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#　'), ctx), undefined);
       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`], '']);
     });
 
     it('valid', () => {

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

@@ -17,11 +17,9 @@ export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
     ].join('').replace(/emoji/g, emoji), 'yu')),
     false,
     [1 | Backtrack.autolink]),
-  union([
-    constraint(State.autolink, state(State.autolink, fmap(convert(
-      source => `[${source}]{ ${source.slice(1)} }`,
-      unsafelink,
-      false),
-      ([{ value }]) => new List([new Data(define(value, { class: 'hashnum', href: null }))])))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ])));
+  constraint(State.autolink, state(State.autolink, fmap(convert(
+    source => `[${source}]{ ${source.slice(1)} }`,
+    union([unsafelink]),
+    false),
+    ([{ value }]) => new List([new Data(define(value, { class: 'hashnum', href: null }))])))),
+  ));

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

@@ -10,33 +10,33 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
 
     it('invalid', () => {
       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('#@'), 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']);
-      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(`#'0`), ctx), [[`#`], `'0`]);
-      assert.deepStrictEqual(inspect(parser(`#'00`), ctx), [[`#`], `'00`]);
-      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('#{{}'), ctx), [['#'], '{{}']);
-      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('#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('# '), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#a#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#a#b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#a#b#c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#a@b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#@a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\ '), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\\n'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('##'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('##a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('###a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`#'`), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`#'0`), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`#'00`), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#_'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#_a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#(a)'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{{}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{}}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{#}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{a}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#12345a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#　'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' #a'), ctx), undefined);
     });
 

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { union, state, constraint, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, state, constraint, verify, rewrite, surround, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
 import { define } from 'typed-dom/dom';
@@ -12,22 +12,21 @@ import { define } from 'typed-dom/dom';
 export const emoji = String.raw`\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F`;
 
 export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
-  open(
+  verify(surround(
     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')),
-      ([{ value }]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)),
-    false,
+    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), 'yu')),
+    str(new RegExp([
+      /(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
+    ].join('').replace(/emoji/g, emoji), 'yu')),
+    false, undefined, undefined,
     [3 | Backtrack.autolink]),
-  union([
-    constraint(State.autolink, state(State.autolink, fmap(convert(
-      source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
-      unsafelink,
-      false),
-      ([{ value }]) => new List([new Data(define(value, { class: 'hashtag' }))])))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ])));
+    ([{ value }]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)),
+  constraint(State.autolink, state(State.autolink, fmap(convert(
+    source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
+    union([unsafelink]),
+    false),
+    ([{ value }]) => new List([new Data(define(value, { class: 'hashtag' }))]))))));

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

@@ -10,12 +10,12 @@ describe('Unit: parser/inline/autolink/url', () => {
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser(' http'), ctx), [['http'], '']);
-      assert.deepStrictEqual(inspect(parser(' ttp'), ctx), [['ttp'], '']);
-      assert.deepStrictEqual(inspect(parser(' http://'), ctx), [['http:'], '//']);
-      assert.deepStrictEqual(inspect(parser(' http://['), ctx), [['http:'], '//[']);
-      assert.deepStrictEqual(inspect(parser(' http://]'), ctx), [['http:'], '//]']);
-      assert.deepStrictEqual(inspect(parser(' Http://host'), ctx), [['Http:'], '//host']);
+      assert.deepStrictEqual(inspect(parser(' '), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(' http'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(' http://'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(' http://['), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(' http://]'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(' Http://host'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' http://[::ffff:0:0%1]'), ctx), [['<a class="invalid">http://[::ffff:0:0%1]</a>'], '']);
       assert.deepStrictEqual(inspect(parser(' http://[::ffff:0:0/96]'), ctx), [['<a class="invalid">http://[::ffff:0:0/96]</a>'], '']);
     });

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

@@ -1,13 +1,14 @@
 import { AutolinkParser } from '../../inline';
 import { State, Recursion, Backtrack } from '../../context';
-import { List, Data } from '../../../combinator/data/parser';
+import { List } from '../../../combinator/data/parser';
 import { union, tails, some, recursion, precedence, state, constraint, verify, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
+import { inline } from '../../inline';
 import { unsafelink } from '../link';
 import { unescsource, str } from '../../source';
 
 export const url: AutolinkParser.UrlParser = lazy(() => rewrite(
   open(
-    /(?<![0-9A-Za-z][.+-]?)https?:\/\/(?=[\x21-\x7E])/y,
+    /(?<![0-9A-Za-z][.+-]?|[@#])https?:\/\/(?=[\x21-\x7E])/y,
     precedence(0, some(union([
       some(unescsource, /(?<![-+*=~^_,.;:!?]|\/{3})(?:[-+*=~^_,.;:!?]|\/{3,}(?!\/))*(?=[\\$"`\[\](){}<>（）［］｛｝|]|[^\x21-\x7E]|$)/y),
       precedence(1, verify(bracket, ns => ns.length > 0)),
@@ -19,7 +20,7 @@ export const url: AutolinkParser.UrlParser = lazy(() => rewrite(
       url => `{ ${url} }`,
       unsafelink,
       false))),
-    ({ context: { source } }) => new List([new Data(source)]),
+    open(str(/[^:]+/y), some(inline)),
   ])));
 
 export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => focus(
@@ -31,7 +32,7 @@ export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => focus(
         url => `{ ${url} }`,
         unsafelink,
         false))),
-      ({ context: { source } }) => new List([new Data(source)]),
+      open(str(/[^:]+/y), some(inline)),
     ]),
   ])));
 

package/src/parser/inline/autolink.ts

@@ -8,14 +8,13 @@ import { account } from './autolink/account';
 import { hashtag, emoji } from './autolink/hashtag';
 import { hashnum } from './autolink/hashnum';
 import { anchor } from './autolink/anchor';
-import { str } from '../source';
 
 export const autolink: AutolinkParser = lazy(() =>
   validate(new RegExp([
     /(?<![0-9a-z])@/yi.source,
     /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source,
     /(?<![0-9a-z])>>/yi.source,
-    /(?<![0-9a-z][.+-]?)!?[0-9a-z]/yi.source,
+    /(?<![0-9a-z][.+-]?|[@#])!?[0-9a-z]/yi.source,
   ].join('|').replace(/emoji/g, emoji), 'yiu'),
   state(~State.autolink,
   union([
@@ -23,14 +22,14 @@ export const autolink: AutolinkParser = lazy(() =>
     url,
     email,
     // Escape unmatched email-like strings.
-    str(/[0-9a-z]+(?:[_.+-][0-9a-z]+[:@]?|:|@(?=@))*/yi),
+    //str(/[0-9a-z]+(?:[_.+-][0-9a-z]+[:@]?|:|@(?=@))*/yi),
     channel,
     account,
     // Escape unmatched account-like strings.
-    str(/@+(?:[0-9a-z]+(?:[_.+-][0-9a-z]+)*)?/yi),
+    //str(/@+(?:[0-9a-z]+(?:[_.+-][0-9a-z]+)*)?/yi),
     hashtag,
     hashnum,
     // Escape unmatched hashtag-like strings.
-    str(new RegExp(/#+(?:(?:[^\p{C}\p{S}\p{P}\s]|emoji)+(?:['_.+-](?:[^\p{C}\p{S}\p{P}\s]|emoji)+)*)?/yu.source.replace(/emoji/g, emoji), 'yu')),
+    //str(new RegExp(/#+(?:(?:[^\p{C}\p{S}\p{P}\s]|emoji)+(?:['_.+-](?:[^\p{C}\p{S}\p{P}\s]|emoji)+)*)?/yu.source.replace(/emoji/g, emoji), 'yu')),
     anchor,
   ]))));