securemark 0.266.0 → 0.268.0

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

@@ -1,5 +1,5 @@
 import { Parser, Ctx } from '../../data/parser';
-import { firstline, isEmpty } from '../constraint/line';
+import { firstline, isBlank } from '../constraint/line';
 import { unshift } from 'spica/array';
 
 export function fence<C extends Ctx, D extends Parser<unknown, C>[]>(opener: RegExp, limit: number, separation = true): Parser<string, C, D> {
@@ -13,20 +13,20 @@ export function fence<C extends Ctx, D extends Parser<unknown, C>[]>(opener: Reg
     if (matches[0].indexOf(delim, delim.length) !== -1) return;
     let rest = source.slice(matches[0].length);
     // Prevent annoying parsing in editing.
-    if (isEmpty(firstline(rest)) && firstline(rest.slice(firstline(rest).length)).trimEnd() !== delim) return;
+    if (isBlank(firstline(rest)) && firstline(rest.slice(firstline(rest).length)).trimEnd() !== delim) return;
     let block = '';
     let closer = '';
     let overflow = '';
     for (let count = 1; ; ++count) {
       if (rest === '') break;
       const line = firstline(rest);
-      if ((closer || count > limit + 1) && isEmpty(line)) break;
+      if ((closer || count > limit + 1) && isBlank(line)) break;
       if(closer) {
         overflow += line;
       }
       if (!closer && count <= limit + 1 && line.slice(0, delim.length) === delim && line.trimEnd() === delim) {
         closer = line;
-        if (isEmpty(firstline(rest.slice(line.length)))) {
+        if (isBlank(firstline(rest.slice(line.length)))) {
           rest = rest.slice(line.length);
           break;
         }

package/src/parser/api/bind.ts

@@ -26,7 +26,7 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
     host: settings.host ?? new ReadonlyURL(location.pathname, location.origin),
     memo: new Memo({ targets: State.backtrackers }),
   };
-  if (context.id?.includes(':')) throw new Error('ID must not contain ":"');
+  if (context.id?.match(/[^0-9a-z/-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   assert(!settings.id);
   type Block = readonly [segment: string, blocks: readonly HTMLElement[], url: string];

package/src/parser/api/parse.test.ts

@@ -99,7 +99,6 @@ describe('Unit: parser/api/parse', () => {
           '@a#b',
           '@domain/a#b',
           '#a',
-          '#domain/a',
           '[#a]',
           '$-a\n$$\n$$',
           '$-a',
@@ -122,7 +121,6 @@ describe('Unit: parser/api/parse', () => {
           '<p><a class="channel" href="https://source/@a?ch=b" target="_blank">@a#b</a></p>',
           '<p><a class="channel" href="https://domain/@a?ch=b" target="_blank">@domain/a#b</a></p>',
           '<p><a class="hashtag" href="https://source/hashtags/a" target="_blank">#a</a></p>',
-          '<p><a class="hashtag" href="https://domain/hashtags/a" target="_blank">#domain/a</a></p>',
           '<p><a class="index" href="#index::a">a</a></p>',
           '<figure data-type="math" data-label="$-a" data-group="$" data-number="1" id="label:$-a"><figcaption><span class="figindex">(1)</span><span class="figtext"></span></figcaption><div><div class="math" translate="no">$$\n$$</div></div></figure>',
           '<p><a class="label" data-label="$-a" href="#label:$-a">(1)</a></p>',

package/src/parser/api/parse.ts

@@ -19,7 +19,6 @@ interface Options extends ParserOptions {
 
 export function parse(source: string, opts: Options = {}, context?: MarkdownParser.Context): DocumentFragment {
   if (!validate(source, MAX_SEGMENT_SIZE)) throw new Error(`Too large input over ${MAX_SEGMENT_SIZE.toLocaleString('en')} bytes`);
-  if (context?.id?.includes(':')) throw new Error('ID must not contain ":"');
   const url = headers(source).find(field => field.toLowerCase().startsWith('url:'))?.slice(4).trim() ?? '';
   source = !context ? normalize(source) : source;
   assert(!context?.delimiters);
@@ -33,6 +32,7 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
     },
     memo: new Memo({ targets: State.backtrackers }),
   };
+  if (context.id?.match(/[^0-9a-z/-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const node = frag();
   let index = 0;

package/src/parser/autolink.ts

@@ -1,28 +1,21 @@
 import { MarkdownParser } from '../../markdown';
-import { union, lazy } from '../combinator';
+import { union, tails, subsequence, some, line, focus, lazy } from '../combinator';
+import { link } from './inline/link';
 import { autolink as autolink_ } from './inline/autolink';
-import { linebreak, unescsource } from './source';
+import { linebreak, unescsource, str } from './source';
+import { format } from './util';
 
 export import AutolinkParser = MarkdownParser.AutolinkParser;
 
-const delimiter = /[@#>0-9A-Za-z\n]|\S[#>]/;
+export const autolink: AutolinkParser = lazy(() => some(line(subsequence([
+  lineurl,
+  some(union([
+    autolink_,
+    linebreak,
+    unescsource,
+  ])),
+]))));
 
-export const autolink: AutolinkParser = ({ source, context }) => {
-  if (source === '') return;
-  assert(source[0] !== '\x1B');
-  const i = source.search(delimiter);
-  switch (i) {
-    case -1:
-      return [[source], ''];
-    case 0:
-      return parser({ source, context });
-    default:
-      return [[source.slice(0, i)], source.slice(i)];
-  }
-};
-
-const parser: AutolinkParser = lazy(() => union([
-  autolink_,
-  linebreak,
-  unescsource
-]));
+export const lineurl: AutolinkParser.LineUrlParser = lazy(() => focus(
+  /^!?https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
+  format(tails([str('!'), link]))));

package/src/parser/block/blockquote.ts

@@ -25,7 +25,7 @@ const source: BlockquoteParser.SourceParser = lazy(() => fmap(
       convert(unindent, source)),
     rewrite(
       some(contentline, opener),
-      convert(unindent, fmap(some(autolink), ns => [html('pre', defrag(ns))]))),
+      convert(unindent, fmap(autolink, ns => [html('pre', defrag(ns))]))),
   ]))),
   ns => [html('blockquote', ns)]));
 

package/src/parser/block/codeblock.ts

@@ -1,6 +1,6 @@
 import { CodeBlockParser } from '../block';
 import { eval } from '../../combinator/data/parser';
-import { some, block, validate, fence, clear, fmap } from '../../combinator';
+import { block, validate, fence, clear, fmap } from '../../combinator';
 import { autolink } from '../autolink';
 import { html, defrag } from 'typed-dom/dom';
 
@@ -69,6 +69,6 @@ export const codeblock: CodeBlockParser = block(validate('```', fmap(
       params.lang
         ? context.caches?.code?.get(`${params.lang ?? ''}\n${body.slice(0, -1)}`)?.cloneNode(true).childNodes ||
           body.slice(0, -1) || undefined
-        : defrag(eval(some(autolink)({ source: body.slice(0, -1), context }), [])));
+        : defrag(eval(autolink({ source: body.slice(0, -1), context }), [])));
     return [el];
   })));

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

@@ -37,8 +37,8 @@ describe('Unit: parser/block/olist', () => {
       // pending
       assert.deepStrictEqual(inspect(parser('1. ')), [['<ol><li></li></ol>'], '']);
       // filled
-      assert.deepStrictEqual(inspect(parser('1. \\')), [['<ol><li></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser('1. \\\n')), [['<ol><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser('1. \\')), [['<ol><li id="index::\\">\\</li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser('1. \\\n')), [['<ol><li id="index::\\">\\</li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('1. -')), [['<ol><li id="index::-">-</li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('1. -\n')), [['<ol><li id="index::-">-</li></ol>'], '']);
       // pending

package/src/parser/block/olist.ts

@@ -6,7 +6,7 @@ import { ilist_ } from './ilist';
 import { inline, indexee, indexer } from '../inline';
 import { contentline } from '../source';
 import { State } from '../context';
-import { trimBlank } from '../visibility';
+import { visualize, trimBlank } from '../visibility';
 import { memoize } from 'spica/memoize';
 import { shift } from 'spica/array';
 import { html, define, defrag } from 'typed-dom/dom';
@@ -37,7 +37,7 @@ const list = (type: string, form: string): OListParser.ListParser => fmap(
   some(creation(1, false, union([
     indexee(fmap(fallback(
       inits([
-        line(open(heads[form], subsequence([checkbox, trimBlank(some(union([indexer, inline])))]), true)),
+        line(open(heads[form], subsequence([checkbox, trimBlank(visualize(some(union([indexer, inline]))))]), true)),
         indent(union([ulist_, olist_, ilist_])),
       ]),
       invalid),

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

@@ -0,0 +1,31 @@
+import { pagebreak } from './pagebreak';
+import { some } from '../../combinator';
+import { inspect } from '../../debug.test';
+
+describe('Unit: parser/block/pagebreak', () => {
+  describe('pagebreak', () => {
+    const parser = (source: string) => some(pagebreak)({ source, context: {} });
+
+    it('invalid', () => {
+      assert.deepStrictEqual(inspect(parser('')), undefined);
+      assert.deepStrictEqual(inspect(parser('\n')), undefined);
+      assert.deepStrictEqual(inspect(parser('=')), undefined);
+      assert.deepStrictEqual(inspect(parser('==')), undefined);
+      assert.deepStrictEqual(inspect(parser('==\n=')), undefined);
+      assert.deepStrictEqual(inspect(parser('===a')), undefined);
+      assert.deepStrictEqual(inspect(parser('===\na')), undefined);
+      assert.deepStrictEqual(inspect(parser('= = =')), undefined);
+      assert.deepStrictEqual(inspect(parser(' ===')), undefined);
+      assert.deepStrictEqual(inspect(parser('---')), undefined);
+    });
+
+    it('valid', () => {
+      assert.deepStrictEqual(inspect(parser('===')), [['<hr>'], '']);
+      assert.deepStrictEqual(inspect(parser('=== ')), [['<hr>'], '']);
+      assert.deepStrictEqual(inspect(parser('===\n')), [['<hr>'], '']);
+      assert.deepStrictEqual(inspect(parser('====')), [['<hr>'], '']);
+    });
+
+  });
+
+});

package/src/parser/block/pagebreak.ts

@@ -0,0 +1,7 @@
+import { PagebreakParser } from '../block';
+import { block, line, focus } from '../../combinator';
+import { html } from 'typed-dom/dom';
+
+export const pagebreak: PagebreakParser = block(line(focus(
+  /^={3,}[^\S\n]*(?:$|\n)/,
+  () => [[html('hr')], ''])));

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

@@ -30,6 +30,9 @@ describe('Unit: parser/block/paragraph', () => {
       assert.deepStrictEqual(inspect(parser('_a\n<wbr>_\nb')), [['<p>_a<br><wbr>_<br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('*a\n<wbr>*\nb')), [['<p>*a<br><wbr>*<br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('==a\n<wbr>==\nb')), [['<p>==a<br><wbr>==<br>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('http://host#!')), [['<p><a class="url" href="http://host#!" target="_blank">http://host#!</a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('a\nhttp://host#\\ \nb')), [['<p>a<br><a class="url" href="http://host#\\" target="_blank">http://host#\\</a><br>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('!http://host#!')), [['<p><a href="http://host#!" target="_blank"><img class="media" data-src="http://host#!" alt=""></a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('\ta')), [['<p>\ta</p>'], '']);
     });
 

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

@@ -14,8 +14,7 @@ export const cite: ReplyParser.CiteParser = creation(1, false, line(fmap(validat
       // リンクの実装は後で検討
       focus(/^>>\.(?=\s*$)/, () => [[html('a', { class: 'anchor' }, '>>.')], '']),
       focus(/^>>#\S*(?=\s*$)/, ({ source }) => [[html('a', { class: 'anchor' }, source)], '']),
-      // Support all domains, but don't support IP(v6) addresses.
-      focus(/^>>https?:\/\/[^\p{C}\p{S}\p{P}\s]\S*(?=\s*$)/u, ({ source }) => [[html('a', { class: 'anchor', href: source.slice(2).trimEnd(), target: '_blank' }, source)], '']),
+      focus(/^>>https?:\/\/(?:[[]|[^\p{C}\p{S}\p{P}\s])\S*(?=\s*$)/u, ({ source }) => [[html('a', { class: 'anchor', href: source.slice(2).trimEnd(), target: '_blank' }, source)], '']),
     ]),
   ]))),
   ([el, quotes = '']: [HTMLElement, string?]) => [

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

@@ -55,6 +55,9 @@ describe('Unit: parser/block/reply/quote', () => {
       assert.deepStrictEqual(inspect(parser('> $-a, $-b')), [['<span class="quote">&gt; $-a, $-b</span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('> $a=b$')), [['<span class="quote">&gt; <span class="math" translate="no" data-src="$a=b$">$a=b$</span></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('> ${a}$')), [['<span class="quote">&gt; <span class="math" translate="no" data-src="${a}$">${a}$</span></span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('> http://host#!')), [['<span class="quote">&gt; <a class="url" href="http://host#!" target="_blank">http://host#!</a></span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('> a\n> http://host#\\ \n> b')), [['<span class="quote">&gt; a<br>&gt; <a class="url" href="http://host#\\" target="_blank">http://host#\\</a> <br>&gt; b</span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('> !http://host#!')), [['<span class="quote">&gt; !<a class="url" href="http://host#!" target="_blank">http://host#!</a></span>', '<br>'], '']);
     });
 
   });

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

@@ -1,9 +1,10 @@
 import { ReplyParser } from '../../block';
 import { eval } from '../../../combinator/data/parser';
-import { union, some, creation, block, line, validate, rewrite, lazy, fmap } from '../../../combinator';
+import { union, subsequence, some, creation, block, line, validate, rewrite, lazy, fmap } from '../../../combinator';
 import { math } from '../../inline/math';
-import { str, anyline } from '../../source';
-import { autolink } from '../../autolink';
+import { autolink } from '../../inline/autolink';
+import { linebreak, unescsource, str, anyline } from '../../source';
+import { lineurl } from '../../autolink';
 import { html, defrag } from 'typed-dom/dom';
 
 export const syntax = /^>+(?=[^\S\n])|^>(?=[^\s>])|^>+(?=[^\s>])(?![0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:]))/;
@@ -40,8 +41,8 @@ const qblock: ReplyParser.QuoteParser.BlockParser = ({ source, context }) => {
   const quotes = source.match(/^>+[^\S\n]/mg)!;
   assert(quotes);
   assert(quotes.length > 0);
-  const content = lines.reduce((acc, line, row) => acc + line.slice(quotes[row].length), '');
-  const nodes = eval(some(text)({ source: content, context }), []);
+  const content = lines.reduce((acc, line, i) => acc + line.slice(quotes[i].length), '');
+  const nodes = eval(text({ source: content, context }), []);
   nodes.unshift(quotes.shift()!);
   for (let i = 0; i < nodes.length; ++i) {
     const child = nodes[i] as string | Text | Element;
@@ -71,7 +72,12 @@ const qblock: ReplyParser.QuoteParser.BlockParser = ({ source, context }) => {
   return [nodes, ''];
 };
 
-const text: ReplyParser.QuoteParser.TextParser = union([
-  math,
-  autolink,
-]);
+const text: ReplyParser.QuoteParser.TextParser = some(line(subsequence([
+  lineurl,
+  some(union([
+    math, // quote補助関数が残した数式をパースする。他の構文で数式を残す場合はソーステキストを直接使用する。
+    autolink,
+    linebreak,
+    unescsource,
+  ])),
+])));

package/src/parser/block/sidefence.ts

@@ -26,6 +26,6 @@ const source: SidefenceParser.SourceParser = lazy(() => fmap(
       convert(unindent, source)),
     rewrite(
       some(contentline, opener),
-      convert(unindent, fmap(some(autolink), ns => [html('pre', defrag(ns))]))),
+      convert(unindent, fmap(autolink, ns => [html('pre', defrag(ns))]))),
   ]))),
   ns => [html('blockquote', ns)]));

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

@@ -26,8 +26,8 @@ describe('Unit: parser/block/ulist', () => {
       // pending
       assert.deepStrictEqual(inspect(parser('- ')), [['<ul><li></li></ul>'], '']);
       // filled
-      assert.deepStrictEqual(inspect(parser('- \\')), [['<ul><li></li></ul>'], '']);
-      assert.deepStrictEqual(inspect(parser('- \\\n')), [['<ul><li></li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- \\')), [['<ul><li id="index::\\">\\</li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- \\\n')), [['<ul><li id="index::\\">\\</li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- -')), [['<ul><li id="index::-">-</li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- -\n')), [['<ul><li id="index::-">-</li></ul>'], '']);
     });

package/src/parser/block/ulist.ts

@@ -4,7 +4,7 @@ import { olist_, invalid } from './olist';
 import { ilist_ } from './ilist';
 import { inline, indexer, indexee } from '../inline';
 import { State } from '../context';
-import { trimBlank } from '../visibility';
+import { visualize, trimBlank } from '../visibility';
 import { unshift } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
@@ -18,7 +18,7 @@ export const ulist_: UListParser = lazy(() => block(fmap(validate(
   some(creation(1, false, union([
     indexee(fmap(fallback(
       inits([
-        line(open(/^-(?:$|\s)/, subsequence([checkbox, trimBlank(some(union([indexer, inline])))]), true)),
+        line(open(/^-(?:$|\s)/, subsequence([checkbox, trimBlank(visualize(some(union([indexer, inline]))))]), true)),
         indent(union([ulist_, olist_, ilist_])),
       ]),
       invalid),

package/src/parser/block.ts

@@ -1,7 +1,7 @@
 import { MarkdownParser } from '../../markdown';
 import { union, reset, creation, open, fallback, recover } from '../combinator';
 import { emptyline } from './source';
-import { horizontalrule } from './block/horizontalrule';
+import { pagebreak } from './block/pagebreak';
 import { heading } from './block/heading';
 import { ulist } from './block/ulist';
 import { olist } from './block/olist';
@@ -19,7 +19,7 @@ import { rnd0Z } from 'spica/random';
 import { html } from 'typed-dom/dom';
 
 export import BlockParser = MarkdownParser.BlockParser;
-export import HorizontalRuleParser = BlockParser.HorizontalRuleParser;
+export import PagebreakParser = BlockParser.PagebreakParser;
 export import HeadingParser = BlockParser.HeadingParser;
 export import UListParser = BlockParser.UListParser;
 export import OListParser = BlockParser.OListParser;
@@ -38,7 +38,7 @@ export const block: BlockParser = creation(1, false, error(
   reset({ resources: { clock: 50 * 1000, recursion: 20 } },
   union([
     emptyline,
-    horizontalrule,
+    pagebreak,
     heading,
     ulist,
     olist,

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

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../../inline';
-import { union, constraint, tails, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, constraint, tails, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
 import { State } from '../../context';
@@ -12,10 +12,8 @@ export const account: AutolinkParser.AccountParser = lazy(() => fmap(rewrite(
   open(
     '@',
     tails([
-      verify(
-        str(/^[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*\//i),
-        ([source]) => source.length <= 253 + 1),
-      str(/^[a-z](?:-(?=[0-9a-z])|[0-9a-z]){0,63}/i),
+      str(/^[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*\//i),
+      str(/^[a-z][0-9a-z]*(?:-[0-9a-z]+)*/i),
     ]))),
   convert(
     source =>

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

@@ -28,8 +28,8 @@ describe('Unit: parser/inline/autolink/anchor', () => {
       assert.deepStrictEqual(inspect(parser('>>0-a')), [['<a class="anchor" href="?at=0-a">&gt;&gt;0-a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('>>0-A')), [['<a class="anchor" href="?at=0-A">&gt;&gt;0-A</a>'], '']);
       assert.deepStrictEqual(inspect(parser('>>0--a')), [['<a class="anchor" href="?at=0">&gt;&gt;0</a>'], '--a']);
-      assert.deepStrictEqual(inspect(parser('>>2000-01-31-23-59-59-999-JST')), [['<a class="anchor" href="?at=2000-01-31-23-59-59-999-JST">&gt;&gt;2000-01-31-23-59-59-999-JST</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>A/2000-01-31-23-59-59-JST')), [['<a class="anchor" href="/@A/timeline/2000-01-31-23-59-59-JST">&gt;&gt;A/2000-01-31-23-59-59-JST</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>2000-0131-2359-59999')), [['<a class="anchor" href="?at=2000-0131-2359-59999">&gt;&gt;2000-0131-2359-59999</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>A/2000-0131-2359-59')), [['<a class="anchor" href="/@A/timeline?at=2000-0131-2359-59">&gt;&gt;A/2000-0131-2359-59</a>'], '']);
     });
 
   });

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

@@ -7,8 +7,9 @@ import { define } from 'typed-dom/dom';
 // Timeline(pseudonym): user/tid
 // Thread(anonymous): cid
 
-// tid: YYYY-MM-DD-HH-MM-SS-TMZ
-// cid: YYYY-MM-DD-HH-MM-SS-mmm-TMZ
+// UTC
+// tid: YYYY-MMDD-HHMM-SS
+// cid: YYYY-MMDD-HHMM-SSmmm
 
 // 内部表現はUnixTimeに統一する(時系列順)
 // 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
@@ -21,7 +22,7 @@ export const anchor: AutolinkParser.AnchorParser = lazy(() => validate('>>', fma
       source =>
         `[${source}]{ ${
         source.includes('/')
-          ? `/@${source.slice(2).replace('/', '/timeline/')}`
+          ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
           : `?at=${source.slice(2)}`
         } }`,
       union([unsafelink])))),

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

@@ -16,8 +16,6 @@ describe('Unit: parser/inline/autolink/channel', () => {
       assert.deepStrictEqual(inspect(parser('@a#1@b')), [['@a#1@b'], '']);
       assert.deepStrictEqual(inspect(parser('@a#b#')), [['@a#b#'], '']);
       assert.deepStrictEqual(inspect(parser('@a#b#1')), [['@a#b#1'], '']);
-      assert.deepStrictEqual(inspect(parser('@a#domain/b')), [['@a#domain/b'], '']);
-      assert.deepStrictEqual(inspect(parser('@domain/a#domain/b')), [['@domain/a#domain/b'], '']);
       assert.deepStrictEqual(inspect(parser(' @a#b')), undefined);
     });
 

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

@@ -14,7 +14,6 @@ export const channel: AutolinkParser.ChannelParser = validate('@', bind(
   ]),
   (es, rest) => {
     const source = stringify(es);
-    if (source.includes('/', source.indexOf('#'))) return;
     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)], rest];

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

@@ -33,7 +33,7 @@ describe('Unit: parser/inline/autolink/hashnum', () => {
       assert.deepStrictEqual(inspect(parser('あ#1')), [['あ#1'], '']);
       assert.deepStrictEqual(inspect(parser(' #1')), undefined);
       assert.deepStrictEqual(inspect(parser('#12345678901234567')), [['#12345678901234567'], '']);
-      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(128)}a`)), [[`#${'1'.repeat(128)}a`], '']);
+      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(16)}a`)), [[`#${'1'.repeat(16)}a`], '']);
     });
 
     it('valid', () => {

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

@@ -34,9 +34,6 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
       assert.deepStrictEqual(inspect(parser('a##1')), [['a##1'], '']);
       assert.deepStrictEqual(inspect(parser('a##b')), [['a##b'], '']);
       assert.deepStrictEqual(inspect(parser('あ#b')), [['あ#b'], '']);
-      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(127)}_`)), [[`#${'1'.repeat(127)}`], '_']);
-      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(127)}_a`)), [[`#${'1'.repeat(127)}`], '_a']);
-      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(127)}_'a`)), [[`#${'1'.repeat(127)}`], `_'a`]);
       assert.deepStrictEqual(inspect(parser(' #a')), undefined);
     });
 
@@ -51,15 +48,13 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
       assert.deepStrictEqual(inspect(parser('#a(b')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '(b']);
       assert.deepStrictEqual(inspect(parser('#a(b)')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '(b)']);
       assert.deepStrictEqual(inspect(parser('#a_')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '_']);
-      assert.deepStrictEqual(inspect(parser('#a__b')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '__b']);
       assert.deepStrictEqual(inspect(parser('#a_b')), [['<a class="hashtag" href="/hashtags/a_b">#a_b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('#a__b')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '__b']);
       assert.deepStrictEqual(inspect(parser('#あ')), [['<a class="hashtag" href="/hashtags/あ">#あ</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#👩')), [['<a class="hashtag" href="/hashtags/👩">#👩</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#1a')), [['<a class="hashtag" href="/hashtags/1a">#1a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#1あ')), [['<a class="hashtag" href="/hashtags/1あ">#1あ</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#1👩')), [['<a class="hashtag" href="/hashtags/1👩">#1👩</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('#domain/a')), [['<a class="hashtag" href="https://domain/hashtags/a" target="_blank">#domain/a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('#domain.co.jp/a')), [['<a class="hashtag" href="https://domain.co.jp/hashtags/a" target="_blank">#domain.co.jp/a</a>'], '']);
       assert.deepStrictEqual(inspect(parser(`#'0`)), [[`<a class="hashtag" href="/hashtags/'0">#'0</a>`], '']);
       assert.deepStrictEqual(inspect(parser(`#'00`)), [[`<a class="hashtag" href="/hashtags/'00">#'00</a>`], '']);
       assert.deepStrictEqual(inspect(parser(`#1'`)), [[`<a class="hashtag" href="/hashtags/1'">#1'</a>`], '']);
@@ -69,6 +64,7 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
       assert.deepStrictEqual(inspect(parser(`#a'b`)), [[`<a class="hashtag" href="/hashtags/a'b">#a'b</a>`], '']);
       assert.deepStrictEqual(inspect(parser(`#a'_b`)), [[`<a class="hashtag" href="/hashtags/a'_b">#a'_b</a>`], '']);
       assert.deepStrictEqual(inspect(parser(`#a_'b`)), [[`<a class="hashtag" href="/hashtags/a_'b">#a_'b</a>`], '']);
+      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(15)}a`)), [[`<a class="hashtag" href="/hashtags/${'1'.repeat(15)}a">#${'1'.repeat(15)}a</a>`], '']);
     });
 
   });

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

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../../inline';
-import { union, tails, constraint, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
 import { State } from '../../context';
@@ -14,24 +14,11 @@ export const hashtag: AutolinkParser.HashtagParser = lazy(() => fmap(rewrite(
   constraint(State.shortcut, false,
   open(
     '#',
-    tails([
-      verify(
-        str(/^[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*\//i),
-        ([source]) => source.length <= 253 + 1),
-      verify(
-        str(new RegExp([
-          /^(?=(?:[0-9]{1,127}_?)?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'))/u.source,
-          /(?:[^\p{C}\p{S}\p{P}\s]|emoji|(?<!')'|_(?=[^\p{C}\p{S}\p{P}\s]|emoji|')){1,128}/u.source,
-          /(?!_?(?:[^\p{C}\p{S}\p{P}\s]|emoji|(?<!')'))/u.source,
-        ].join('').replace(/emoji/g, emoji), 'u')),
-        ([source]) => source.length <= 128),
-    ]))),
+    str(new RegExp([
+      /^(?=(?:[0-9]{1,15})?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'))/u.source,
+      /(?:[^\p{C}\p{S}\p{P}\s]|emoji|(?<!')'|_(?=[^\p{C}\p{S}\p{P}\s]|emoji|'))+/u.source,
+    ].join('').replace(/emoji/g, emoji), 'u')))),
   convert(
-    source =>
-      `[${source}]{ ${
-      source.includes('/')
-        ? `https://${source.slice(1).replace('/', '/hashtags/')}`
-        : `/hashtags/${source.slice(1)}`
-      } }`,
+    source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
     union([unsafelink]))),
-  ([el]) => [define(el, { class: 'hashtag' }, el.innerText)]));
+  ([el]) => [define(el, { class: 'hashtag' })]));

package/src/parser/inline/extension/index.ts

@@ -14,7 +14,7 @@ export const index: IndexParser = lazy(() => validate('[#', fmap(indexee(surroun
   constraint(State.index, false,
   syntax(Syntax.index, 2, 1, State.linkers | State.media,
   startTight(
-  open(stropt(/^\|?/), trimBlankEnd(some(union([
+  open(stropt('|'), trimBlankEnd(some(union([
     signature,
     inline,
   ]), ']', [[/^\\?\n/, 9], [']', 2]])), true)))),

package/src/parser/inline/extension/indexee.ts

@@ -9,6 +9,7 @@ export function indexee(parser: Parser<HTMLElement, MarkdownParser.Context>, opt
 }
 
 export function identity(id: string | undefined, text: string, name: 'index' | 'mark' = 'index'): string | undefined {
+  assert(!id?.match(/[^0-9a-z/-]/i));
   assert(!text.includes('\n'));
   if (id === '') return undefined;
   text &&= text.trim().replace(/\s+/g, '_');

package/src/parser/inline/link.ts

@@ -180,6 +180,7 @@ export function resolve(uri: string, host: URL | Location, source: URL | Locatio
     case uri.slice(0, 2) === '^/':
       const last = host.pathname.slice(host.pathname.lastIndexOf('/') + 1);
       return last.includes('.') // isFile
+          // Exclude ISO 6709.
           && /^[0-9]*[a-z][0-9a-z]*$/i.test(last.slice(last.lastIndexOf('.') + 1))
         ? `${host.pathname.slice(0, -last.length)}${uri.slice(2)}`
         : `${host.pathname.replace(/\/?$/, '/')}${uri.slice(2)}`;

package/src/parser/inline.test.ts

@@ -122,6 +122,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('a@b')), [['<a class="email" href="mailto:a@b">a@b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('_a@b')), [['_', '<a class="email" href="mailto:a@b">a@b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('_a@b_')), [['<em><a class="email" href="mailto:a@b">a@b</a></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('_a_b@c_')), [['<em><a class="email" href="mailto:a_b@c">a_b@c</a></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*a@b*')), [['<strong><a class="email" href="mailto:a@b">a@b</a></strong>'], '']);
       assert.deepStrictEqual(inspect(parser('(a@b)')), [['<span class="paren">(<a class="email" href="mailto:a@b">a@b</a>)</span>'], '']);
       assert.deepStrictEqual(inspect(parser(' a@b')), [[' ', '<a class="email" href="mailto:a@b">a@b</a>'], '']);
@@ -130,9 +131,7 @@ describe('Unit: parser/inline', () => {
 
     it('channel', () => {
       assert.deepStrictEqual(inspect(parser('@a#b')), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('@a#domain/b')), [['@a#domain/b'], '']);
       assert.deepStrictEqual(inspect(parser('@domain/a#b')), [['<a class="channel" href="https://domain/@a?ch=b" target="_blank">@domain/a#b</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('@domain/a#domain/b')), [['@domain/a#domain/b'], '']);
       assert.deepStrictEqual(inspect(parser('_@a#b')), [['_', '<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
       assert.deepStrictEqual(inspect(parser(' @a#b')), [[' ', '<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
     });
@@ -152,6 +151,8 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('#a')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#a\nb\n#c\n[#d]')), [['<a class="hashtag" href="/hashtags/a">#a</a>', '<br>', 'b', '<br>', '<a class="hashtag" href="/hashtags/c">#c</a>', '<br>', '<a class="index" href="#index::d">d</a>'], '']);
       assert.deepStrictEqual(inspect(parser('##a')), [['##a'], '']);
+      assert.deepStrictEqual(inspect(parser('_#a')), [['_', '<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('_#a_')), [['<em><a class="hashtag" href="/hashtags/a">#a</a></em>'], '']);
       assert.deepStrictEqual(inspect(parser('a#b')), [['a#b'], '']);
       assert.deepStrictEqual(inspect(parser('0a#b')), [['0a#b'], '']);
       assert.deepStrictEqual(inspect(parser('あ#b')), [['あ#b'], '']);
@@ -173,6 +174,8 @@ describe('Unit: parser/inline', () => {
     it('hashnum', () => {
       assert.deepStrictEqual(inspect(parser('#1')), [['<a class="hashnum">#1</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#12345678901234567@a')), [['#12345678901234567@a'], '']);
+      assert.deepStrictEqual(inspect(parser('_#1_')), [['<em><a class="hashnum">#1</a></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('_#1_0')), [['<em><a class="hashnum">#1</a></em>', '0'], '']);
       assert.deepStrictEqual(inspect(parser('「#1」')), [['「', '<a class="hashnum">#1</a>', '」'], '']);
     });
 

package/src/parser/source/line.ts

@@ -1,6 +1,6 @@
 import { AnyLineParser, EmptyLineParser, ContentLineParser } from '../source';
-import { line, isEmpty } from '../../combinator';
+import { line, isBlank } from '../../combinator';
 
 export const anyline: AnyLineParser = line(() => [[], '']);
-export const emptyline: EmptyLineParser = line(i => isEmpty(i.source) ? [[], ''] : undefined);
-export const contentline: ContentLineParser = line(i => !isEmpty(i.source) ? [[], ''] : undefined);
+export const emptyline: EmptyLineParser = line(i => isBlank(i.source) ? [[], ''] : undefined);
+export const contentline: ContentLineParser = line(i => !isBlank(i.source) ? [[], ''] : undefined);