securemark 0.267.0 → 0.268.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.267.0",
+  "version": "0.268.1",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -34,13 +34,13 @@
     "@types/mocha": "10.0.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.49.0",
+    "@typescript-eslint/parser": "^5.53.0",
     "babel-loader": "^9.1.2",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^7.6.0",
-    "eslint": "^8.32.0",
-    "eslint-plugin-redos": "^4.4.3",
-    "eslint-webpack-plugin": "^3.2.0",
+    "eslint": "^8.35.0",
+    "eslint-plugin-redos": "^4.4.5",
+    "eslint-webpack-plugin": "^4.0.0",
     "glob": "^8.1.0",
     "karma": "^6.4.1",
     "karma-chrome-launcher": "^3.1.1",
@@ -49,12 +49,12 @@
     "karma-mocha": "^2.0.1",
     "karma-power-assert": "^1.0.0",
     "mocha": "^10.2.0",
-    "npm-check-updates": "^16.6.3",
+    "npm-check-updates": "^16.7.9",
     "semver": "^7.3.8",
     "spica": "0.0.719",
     "ts-loader": "^9.4.2",
-    "typed-dom": "^0.0.315",
-    "typescript": "4.9.4",
+    "typed-dom": "^0.0.316",
+    "typescript": "4.9.5",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",
     "webpack-merge": "^5.8.0"

package/src/combinator/control/constraint/block.ts

@@ -1,6 +1,6 @@
 import { Parser, exec } from '../../data/parser';
 import { Memo } from '../../data/parser/context/memo';
-import { firstline, isEmpty } from './line';
+import { firstline, isBlank } from './line';
 
 export function block<P extends Parser<unknown>>(parser: P, separation?: boolean): P;
 export function block<T>(parser: Parser<T>, separation = true): Parser<T> {
@@ -11,7 +11,7 @@ export function block<T>(parser: Parser<T>, separation = true): Parser<T> {
     const result = parser({ source, context });
     if (result === undefined) return;
     const rest = exec(result);
-    if (separation && !isEmpty(firstline(rest))) return;
+    if (separation && !isBlank(firstline(rest))) return;
     assert(rest === '' || source[source.length - rest.length - 1] === '\n');
     return rest === '' || source[source.length - rest.length - 1] === '\n'
       ? result

package/src/combinator/control/constraint/line.ts

@@ -14,7 +14,7 @@ export function line<T>(parser: Parser<T>): Parser<T> {
     assert(check(line, result));
     context.offset -= source.length - line.length;
     if (result === undefined) return;
-    return isEmpty(exec(result))
+    return isBlank(exec(result))
       ? [eval(result), source.slice(line.length)]
       : undefined;
   };
@@ -32,7 +32,7 @@ export function firstline(source: string): string {
   }
 }
 
-export function isEmpty(line: string): boolean {
+export function isBlank(line: string): boolean {
   return line === ''
       || line === '\n'
       || line.trimStart() === '';

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?.match(/[^0-9a-z-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
+  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.ts

@@ -32,7 +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.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.test.ts

@@ -1,10 +1,9 @@
 import { autolink } from './autolink';
-import { some } from '../combinator';
 import { inspect } from '../debug.test';
 
 describe('Unit: parser/autolink', () => {
   describe('autolink', () => {
-    const parser = (source: string) => some(autolink)({ source, context: {} });
+    const parser = (source: string) => autolink({ source, context: {} });
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser(' http://host')), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);

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

@@ -30,15 +30,15 @@ describe('Unit: parser/block/olist', () => {
       assert.deepStrictEqual(inspect(parser('(1)\n')), undefined);
       assert.deepStrictEqual(inspect(parser('(I) ')), undefined);
       assert.deepStrictEqual(inspect(parser('(A) ')), undefined);
-      assert.deepStrictEqual(inspect(parser(' 1.')), undefined);
+      assert.deepStrictEqual(inspect(parser(' 1. ')), undefined);
     });
 
     it('single', () => {
       // 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
@@ -91,7 +91,7 @@ describe('Unit: parser/block/olist', () => {
       assert.deepStrictEqual(inspect(parser('01. ')), [['<ol><li data-marker="01."></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('0.\n1')), [['<ol><li></li><li data-marker="1."></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('8.\n9')), [['<ol><li data-marker="8."></li><li data-marker="9."></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser('9.\n9')), [['<ol><li data-marker="9."></li><li data-marker="9."></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser('9.\n9')), [['<ol><li data-marker="9."></li><li data-marker="9." class="invalid"></li></ol>'], '']);
     });
 
     it('branch', () => {

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';
@@ -27,17 +27,17 @@ export const olist: OListParser = lazy(() => block(validate(
 export const olist_: OListParser = lazy(() => block(union([
   match(
     openers['.'],
-    memoize(ms => list(type(ms[1]), '.'), ms => type(ms[1]).charCodeAt(0) || 0, [])),
+    memoize(ms => list(type(ms[1]), '.'), ms => index(ms[1]), [])),
   match(
     openers['('],
-    memoize(ms => list(type(ms[1]), '('), ms => type(ms[1]).charCodeAt(0) || 0, [])),
+    memoize(ms => list(type(ms[1]), '('), ms => index(ms[1]), [])),
 ])));
 
 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),
@@ -61,14 +61,29 @@ export const invalid = rewrite(
     '',
     html('span', {
       class: 'invalid',
-      'data-invalid-syntax': 'listitem',
+      'data-invalid-syntax': 'list',
       'data-invalid-type': 'syntax',
       'data-invalid-message': 'Fix the indent or the head of the list item',
     }, source.replace('\n', ''))
   ], '']);
 
-function type(index: string): string {
-  switch (index) {
+function index(value: string): number {
+  switch (value) {
+    case 'i':
+      return 1;
+    case 'a':
+      return 2;
+    case 'I':
+      return 3;
+    case 'A':
+      return 4;
+    default:
+      return 0;
+  }
+}
+
+function type(value: string): string {
+  switch (value) {
     case 'i':
       return 'i';
     case 'a':
@@ -97,7 +112,7 @@ function style(type: string): string {
   }
 }
 
-function initial(type: string): RegExp {
+function pattern(type: string): RegExp {
   switch (type) {
     case 'i':
       return /^\(?i[).]?$/;
@@ -112,25 +127,37 @@ function initial(type: string): RegExp {
   }
 }
 
-function format(el: HTMLOListElement, type: string, form: string): HTMLOListElement {
-  if (el.firstElementChild?.firstElementChild?.className === 'checkbox') {
-    el.setAttribute('class', 'checklist');
+function format(list: HTMLOListElement, type: string, form: string): HTMLOListElement {
+  if (list.firstElementChild?.firstElementChild?.classList.contains('checkbox')) {
+    list.classList.add('checklist');
   }
-  define(el, {
+  define(list, {
     type: type || undefined,
     'data-format': form === '.' ? undefined : 'paren',
     'data-type': style(type) || undefined,
   });
-  const marker = el.firstElementChild?.getAttribute('data-marker')!.match(initial(type))?.[0] ?? '';
-  for (let es = el.children, len = es.length, i = 0; i < len; ++i) {
-    const el = es[i];
-    switch (el.getAttribute('data-marker')) {
-      case '':
-      case marker:
-        el.removeAttribute('data-marker');
+  const marker = list.firstElementChild?.getAttribute('data-marker') ?? '';
+  // TODO: CSSカウンターをattr(start)でリセットできるようになればstart値からのオートインクリメントに対応させる。
+  const start = marker.match(pattern(type))?.[0] ?? '';
+  for (let es = list.children, len = es.length, i = 0; i < len; ++i) {
+    const item = es[i];
+    assert(item.getAttribute('data-marker') !== '');
+    switch (item.getAttribute('data-marker')) {
+      case null:
         continue;
+      case start:
+        item.removeAttribute('data-marker');
+        continue;
+      case marker:
+        if (i === 0 || item.classList.contains('invalid')) continue;
+        define(item, {
+          class: 'invalid',
+          'data-invalid-syntax': 'list',
+          'data-invalid-type': 'index',
+          'data-invalid-message': 'Fix the duplicate index',
+        });
     }
     break;
   }
-  return el;
+  return list;
 }

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

@@ -17,7 +17,7 @@ describe('Unit: parser/block/ulist', () => {
       assert.deepStrictEqual(inspect(parser('-[ ]')), undefined);
       assert.deepStrictEqual(inspect(parser('-[x]')), undefined);
       assert.deepStrictEqual(inspect(parser('-\n')), undefined);
-      assert.deepStrictEqual(inspect(parser(' -')), undefined);
+      assert.deepStrictEqual(inspect(parser(' - ')), undefined);
       assert.deepStrictEqual(inspect(parser('+')), undefined);
       assert.deepStrictEqual(inspect(parser('*')), undefined);
     });
@@ -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),
@@ -40,9 +40,9 @@ export function fillFirstLine(ns: (HTMLElement | string)[]): (HTMLElement | stri
     : ns;
 }
 
-function format(el: HTMLUListElement): HTMLUListElement {
-  if (el.firstElementChild?.firstElementChild?.className === 'checkbox') {
-    el.setAttribute('class', 'checklist');
+function format(list: HTMLUListElement): HTMLUListElement {
+  if (list.firstElementChild?.firstElementChild?.classList.contains('checkbox')) {
+    list.classList.add('checklist');
   }
-  return el;
+  return list;
 }

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,7 +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(!id?.match(/[^0-9a-z/-]/i));
   assert(!text.includes('\n'));
   if (id === '') return undefined;
   text &&= text.trim().replace(/\s+/g, '_');
@@ -33,6 +33,7 @@ assert(identity(undefined, '0'.repeat(200) + 1, 'mark')!.slice(6) === '0'.repeat
 export function text(source: HTMLElement | DocumentFragment, optional = false): string {
   assert(source instanceof DocumentFragment || !source.matches('.indexer'));
   assert(source.querySelectorAll(':scope > .indexer').length <= 1);
+  if (!source.firstChild) return '';
   const indexer = source.querySelector(':scope > .indexer');
   const index = indexer?.getAttribute('data-index');
   if (index) return index;

package/src/parser/processor/figure.ts

@@ -139,8 +139,7 @@ export function* figure(
     }
     labels.add(label);
     opts.id !== '' && def.setAttribute('id', `label:${opts.id ? `${opts.id}:` : ''}${label}`);
-    for (let rs = refs.take(label, Infinity), i = 0; i < rs.length; ++i) {
-      const ref = rs[i];
+    for (const ref of refs.take(label, Infinity)) {
       if (ref.getAttribute('data-invalid-message') === messages.reference) {
         define(ref, {
           class: void ref.classList.remove('invalid'),

package/src/parser/processor/footnote.test.ts

@@ -22,7 +22,7 @@ describe('Unit: parser/processor/footnote', () => {
       const target = parse('((a b))');
       const footnote = html('ol');
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target, footnote)].length, i === 0 ? 3 : 2);
+        assert.deepStrictEqual([...annotation(target, footnote)].length, i === 0 ? 2 : 1);
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -48,7 +48,7 @@ describe('Unit: parser/processor/footnote', () => {
       const target = parse('((1))((12345678901234567890))');
       const footnote = html('ol');
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target, footnote)].length, i === 0 ? 6 : 4);
+        assert.deepStrictEqual([...annotation(target, footnote)].length, i === 0 ? 4 : 2);
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -165,7 +165,7 @@ describe('Unit: parser/processor/footnote', () => {
       const target = parse('((a b))');
       const footnote = html('ol');
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target, footnote, { id: '0' })].length, i === 0 ? 3 : 2);
+        assert.deepStrictEqual([...annotation(target, footnote, { id: '0' })].length, i === 0 ? 2 : 1);
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [