securemark 0.266.0 → 0.267.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.267.0
+
+- Change horizontalrule syntax to pagebreak syntax.
+
 ## 0.266.0
 
 - Change index schemas.

package/README.md

@@ -50,7 +50,7 @@ https://falsandtru.github.io/securemark/
 - Table (| |)
 - Blockquote (>, !>)
 - Preformattedtext (```)
-- HorizontalRule (---)
+- Pagebreak (===)
 - Inline markups (_, *, `, []{}, {}, ![]{}, !{}, \[](), ++, ~~, (()), ...)
 - Inline HTML tags (\<bdi>, \<bdo>)
 - Autolink (https://host, user@host, @user)

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.266.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.267.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("Prism"), require("DOMPurify"));
@@ -3908,7 +3908,7 @@ function bind(target, settings) {
     })
   };
 
-  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}`);
   const blocks = [];
   const adds = [];
@@ -4226,7 +4226,6 @@ const url_1 = __webpack_require__(2261);
 const dom_1 = __webpack_require__(3252);
 function parse(source, opts = {}, context) {
   if (!(0, segment_1.validate)(source, segment_1.MAX_SEGMENT_SIZE)) throw new Error(`Too large input over ${segment_1.MAX_SEGMENT_SIZE.toLocaleString('en')} bytes`);
-  if (context?.id?.includes(':')) throw new Error('ID must not contain ":"');
   const url = (0, header_2.headers)(source).find(field => field.toLowerCase().startsWith('url:'))?.slice(4).trim() ?? '';
   source = !context ? (0, normalize_1.normalize)(source) : source;
   context = {
@@ -4242,6 +4241,7 @@ function parse(source, opts = {}, context) {
     })
   };
 
+  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 = (0, dom_1.frag)();
   let index = 0;
@@ -4314,7 +4314,7 @@ Object.defineProperty(exports, "__esModule", ({
 exports.block = void 0;
 const combinator_1 = __webpack_require__(2087);
 const source_1 = __webpack_require__(6743);
-const horizontalrule_1 = __webpack_require__(9967);
+const pagebreak_1 = __webpack_require__(4107);
 const heading_1 = __webpack_require__(4623);
 const ulist_1 = __webpack_require__(5425);
 const olist_1 = __webpack_require__(7471);
@@ -4335,7 +4335,7 @@ exports.block = (0, combinator_1.creation)(1, false, error((0, combinator_1.rese
     clock: 50 * 1000,
     recursion: 20
   }
-}, (0, combinator_1.union)([source_1.emptyline, horizontalrule_1.horizontalrule, heading_1.heading, ulist_1.ulist, olist_1.olist, ilist_1.ilist, dlist_1.dlist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, extension_1.extension, sidefence_1.sidefence, blockquote_1.blockquote, reply_1.reply, paragraph_1.paragraph]))));
+}, (0, combinator_1.union)([source_1.emptyline, pagebreak_1.pagebreak, heading_1.heading, ulist_1.ulist, olist_1.olist, ilist_1.ilist, dlist_1.dlist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, extension_1.extension, sidefence_1.sidefence, blockquote_1.blockquote, reply_1.reply, paragraph_1.paragraph]))));
 function error(parser) {
   return (0, combinator_1.recover)((0, combinator_1.fallback)((0, combinator_1.open)('\x07', ({
     source
@@ -5168,22 +5168,6 @@ exports.heading = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segm
 
 /***/ }),
 
-/***/ 9967:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports.horizontalrule = void 0;
-const combinator_1 = __webpack_require__(2087);
-const dom_1 = __webpack_require__(3252);
-exports.horizontalrule = (0, combinator_1.block)((0, combinator_1.line)((0, combinator_1.focus)(/^-{3,}[^\S\n]*(?:$|\n)/, () => [[(0, dom_1.html)('hr')], ''])));
-
-/***/ }),
-
 /***/ 238:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -5356,6 +5340,22 @@ function format(el, type, form) {
 
 /***/ }),
 
+/***/ 4107:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.pagebreak = void 0;
+const combinator_1 = __webpack_require__(2087);
+const dom_1 = __webpack_require__(3252);
+exports.pagebreak = (0, combinator_1.block)((0, combinator_1.line)((0, combinator_1.focus)(/^={3,}[^\S\n]*(?:$|\n)/, () => [[(0, dom_1.html)('hr')], ''])));
+
+/***/ }),
+
 /***/ 6457:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -5805,7 +5805,7 @@ const link_1 = __webpack_require__(9628);
 const source_1 = __webpack_require__(6743);
 const dom_1 = __webpack_require__(3252);
 // https://example/@user must be a user page or a redirect page going there.
-exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('@', (0, combinator_1.tails)([(0, combinator_1.verify)((0, source_1.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), (0, source_1.str)(/^[a-z](?:-(?=[0-9a-z])|[0-9a-z]){0,63}/i)]))), (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/@')}` : `/${source}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
+exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('@', (0, combinator_1.tails)([(0, source_1.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), (0, source_1.str)(/^[a-z][0-9a-z]*(?:-[0-9a-z]+)*/i)]))), (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/@')}` : `/${source}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
   class: 'account'
 })]));
 
@@ -5826,11 +5826,12 @@ const link_1 = __webpack_require__(9628);
 const dom_1 = __webpack_require__(3252);
 // 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に統一する(時系列順)
 // 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
-exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('>>', (0, combinator_1.fmap)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.focus)(/^>>(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9a-z@#:])/i, (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `/@${source.slice(2).replace('/', '/timeline/')}` : `?at=${source.slice(2)}`} }`, (0, combinator_1.union)([link_1.unsafelink])))), ([el]) => [(0, dom_1.define)(el, {
+exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('>>', (0, combinator_1.fmap)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.focus)(/^>>(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9a-z@#:])/i, (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `/@${source.slice(2).replace('/', '/timeline?at=')}` : `?at=${source.slice(2)}`} }`, (0, combinator_1.union)([link_1.unsafelink])))), ([el]) => [(0, dom_1.define)(el, {
   class: 'anchor'
 })])));
 
@@ -5854,7 +5855,6 @@ const dom_1 = __webpack_require__(3252);
 // https://example/@user?ch=a+b must be a user channel page or a redirect page going there.
 exports.channel = (0, combinator_1.validate)('@', (0, combinator_1.bind)((0, combinator_1.sequence)([account_1.account, (0, combinator_1.some)(hashtag_1.hashtag)]), (es, rest) => {
   const source = (0, util_1.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 [[(0, dom_1.define)(el, {
@@ -5927,9 +5927,9 @@ const dom_1 = __webpack_require__(3252);
 // https://example/hashtags/a must be a hashtag page or a redirect page going there.
 // https://github.com/tc39/proposal-regexp-unicode-property-escapes#matching-emoji
 exports.emoji = String.raw`\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F`;
-exports.hashtag = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('#', (0, combinator_1.tails)([(0, combinator_1.verify)((0, source_1.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), (0, combinator_1.verify)((0, source_1.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, exports.emoji), 'u')), ([source]) => source.length <= 128)]))), (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/hashtags/')}` : `/hashtags/${source.slice(1)}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
+exports.hashtag = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('#', (0, source_1.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, exports.emoji), 'u')))), (0, combinator_1.convert)(source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
   class: 'hashtag'
-}, el.innerText)]));
+})]));
 
 /***/ }),
 
@@ -6489,6 +6489,7 @@ function resolve(uri, host, source) {
     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)}`;
     case host.origin === source.origin && host.pathname === source.pathname:
     case uri.slice(0, 2) === '//':

package/index.d.ts

@@ -28,8 +28,7 @@ export type ParserOptions = Omit<Partial<ParserSettings>, 'chunk'>;
 export interface ParserSettings {
   // Host URL.
   readonly host?: URL;
-  // ID of comments and timelines.
-  // Must not contain ":".
+  // Alphanumeric ID of comments and timelines.
   readonly id?: string;
   // For editing.
   readonly caches?: Partial<Caches>;
@@ -40,12 +39,12 @@ export interface ParserSettings {
 }
 
 export type Progress =
-  | { type: 'segment', value: string; }
-  | { type: 'block', value: HTMLElement }
-  | { type: 'figure', value: HTMLAnchorElement }
-  | { type: 'footnote', value: HTMLLIElement | HTMLElement }
-  | { type: 'break' }
-  | { type: 'cancel' };
+  | { readonly type: 'segment'; readonly value: string; }
+  | { readonly type: 'block'; readonly value: HTMLElement; }
+  | { readonly type: 'figure'; readonly value: HTMLAnchorElement; }
+  | { readonly type: 'footnote'; readonly value: HTMLLIElement | HTMLElement; }
+  | { readonly type: 'break'; }
+  | { readonly type: 'cancel'; };
 
 export interface RenderingOptions {
   readonly code?: (target: HTMLElement, cache?: Dict<string, HTMLElement>) => void;

package/markdown.d.ts

@@ -59,7 +59,7 @@ export namespace MarkdownParser {
     Markdown<'block'>,
     Parser<HTMLElement, Context, [
       SourceParser.EmptyLineParser,
-      BlockParser.HorizontalRuleParser,
+      BlockParser.PagebreakParser,
       BlockParser.HeadingParser,
       BlockParser.UListParser,
       BlockParser.OListParser,
@@ -77,9 +77,9 @@ export namespace MarkdownParser {
   }
   export namespace BlockParser {
     interface Block<T extends string> extends Markdown<`block/${T}`> { }
-    export interface HorizontalRuleParser extends
-      // ---
-      Block<'horizontalrule'>,
+    export interface PagebreakParser extends
+      // ===
+      Block<'pagebreak'>,
       Parser<HTMLHRElement, Context, [
         SourceParser.StrParser,
       ]> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.266.0",
+  "version": "0.267.0",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",

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/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.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/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/block/horizontalrule.test.ts

@@ -1,31 +0,0 @@
-import { horizontalrule } from './horizontalrule';
-import { some } from '../../combinator';
-import { inspect } from '../../debug.test';
-
-describe('Unit: parser/block/horizontalrule', () => {
-  describe('horizontalrule', () => {
-    const parser = (source: string) => some(horizontalrule)({ 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/horizontalrule.ts

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