securemark 0.268.0 → 0.268.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.268.2
+
+- Refactoring.
+
+## 0.268.1
+
+- Refactoring.
+
 ## 0.268.0
 
 - Add lineurl syntax.

package/README.md

@@ -31,10 +31,6 @@ Secure markdown renderer working on browsers for user input data.
 - Audio (.oga, .ogg)
 - Images
 
-## Demos
-
-https://falsandtru.github.io/securemark/
-
 ## APIs
 
 [index.d.ts](index.d.ts)

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.268.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.268.2 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"));
@@ -5234,7 +5234,7 @@ const openers = {
   '(': /^\(([0-9]*|[a-z]*)(?![^)\n])\)?(?:-(?!-)[0-9]*)*(?:$|\s)/
 };
 exports.olist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(new RegExp([/^([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*\.(?=[^\S\n]|\n[^\S\n]*\S)/.source, /^\(([0-9]+|[a-z]+)\)(?:-[0-9]+)*(?=[^\S\n]|\n[^\S\n]*\S)/.source].join('|')), (0, combinator_1.state)(8 /* State.media */, exports.olist_))));
-exports.olist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.union)([(0, combinator_1.match)(openers['.'], (0, memoize_1.memoize)(ms => list(type(ms[1]), '.'), ms => type(ms[1]).charCodeAt(0) || 0, [])), (0, combinator_1.match)(openers['('], (0, memoize_1.memoize)(ms => list(type(ms[1]), '('), ms => type(ms[1]).charCodeAt(0) || 0, []))])));
+exports.olist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.union)([(0, combinator_1.match)(openers['.'], (0, memoize_1.memoize)(ms => list(type(ms[1]), '.'), ms => index(ms[1]), [])), (0, combinator_1.match)(openers['('], (0, memoize_1.memoize)(ms => list(type(ms[1]), '('), ms => index(ms[1]), []))])));
 const list = (type, form) => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(heads[form], (0, combinator_1.subsequence)([ulist_1.checkbox, (0, visibility_1.trimBlank)((0, visibility_1.visualize)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, exports.olist_, ilist_1.ilist_]))]), exports.invalid), ns => [(0, dom_1.html)('li', {
   'data-marker': ns[0] || undefined
 }, (0, dom_1.defrag)((0, ulist_1.fillFirstLine)((0, array_1.shift)(ns)[1])))]), true)]))), es => [format((0, dom_1.html)('ol', es), type, form)]);
@@ -5252,12 +5252,26 @@ exports.invalid = (0, combinator_1.rewrite)((0, combinator_1.inits)([source_1.co
   source
 }) => [['', (0, dom_1.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) {
-  switch (index) {
+function index(value) {
+  switch (value) {
+    case 'i':
+      return 1;
+    case 'a':
+      return 2;
+    case 'I':
+      return 3;
+    case 'A':
+      return 4;
+    default:
+      return 0;
+  }
+}
+function type(value) {
+  switch (value) {
     case 'i':
       return 'i';
     case 'a':
@@ -5284,7 +5298,7 @@ function style(type) {
       return '';
   }
 }
-function initial(type) {
+function pattern(type) {
   switch (type) {
     case 'i':
       return /^\(?i[).]?$/;
@@ -5298,27 +5312,38 @@ function initial(type) {
       return /^\(?[01][).]?$/;
   }
 }
-function format(el, type, form) {
-  if (el.firstElementChild?.firstElementChild?.className === 'checkbox') {
-    el.setAttribute('class', 'checklist');
+function format(list, type, form) {
+  if (list.firstElementChild?.firstElementChild?.classList.contains('checkbox')) {
+    list.classList.add('checklist');
   }
-  (0, dom_1.define)(el, {
+  (0, dom_1.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];
+    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;
+        (0, dom_1.define)(item, {
+          class: 'invalid',
+          'data-invalid-syntax': 'list',
+          'data-invalid-type': 'index',
+          'data-invalid-message': 'Fix the duplicate index'
+        });
     }
     break;
   }
-  return el;
+  return list;
 }
 
 /***/ }),
@@ -5587,11 +5612,11 @@ function fillFirstLine(ns) {
   return ns.length === 1 && typeof ns[0] === 'object' && ['UL', 'OL'].includes(ns[0].tagName) ? (0, array_1.unshift)([(0, dom_1.html)('br')], ns) : ns;
 }
 exports.fillFirstLine = fillFirstLine;
-function format(el) {
-  if (el.firstElementChild?.firstElementChild?.className === 'checkbox') {
-    el.setAttribute('class', 'checklist');
+function format(list) {
+  if (list.firstElementChild?.firstElementChild?.classList.contains('checkbox')) {
+    list.classList.add('checklist');
   }
-  return el;
+  return list;
 }
 
 /***/ }),
@@ -6118,16 +6143,18 @@ function identity(id, text, name = 'index') {
   if (id === '') return undefined;
   text &&= text.trim().replace(/\s+/g, '_');
   if (text === '') return undefined;
-  if (text.length <= 100) return `${name}:${id ?? ''}:${text}`;
+  const cs = [...text];
+  if (cs.length <= 100) return `${name}:${id ?? ''}:${text}`;
   switch (name) {
     case 'index':
-      return `${name}:${id ?? ''}:${text.slice(0, 97)}...`;
+      return `${name}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
     case 'mark':
-      return `${name}:${id ?? ''}:${text.slice(0, 50)}...${text.slice(-47)}`;
+      return `${name}:${id ?? ''}:${cs.slice(0, 50).join('')}...${cs.slice(-47).join('')}`;
   }
 }
 exports.identity = identity;
 function text(source, optional = false) {
+  if (!source.firstChild) return '';
   const indexer = source.querySelector(':scope > .indexer');
   const index = indexer?.getAttribute('data-index');
   if (index) return index;
@@ -6959,8 +6986,7 @@ function* figure(target, footnotes, opts = {}) {
     }
     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) {
         (0, dom_1.define)(ref, {
           class: void ref.classList.remove('invalid'),
@@ -7026,7 +7052,6 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.reference = exports.annotation = exports.footnote = void 0;
 const indexee_1 = __webpack_require__(1269);
-const queue_1 = __webpack_require__(4934);
 const dom_1 = __webpack_require__(3252);
 function* footnote(target, footnotes, opts = {}, bottom = null) {
   for (let es = target.querySelectorAll(`.annotations`), len = es.length, i = 0; i < len; ++i) {
@@ -7040,23 +7065,35 @@ function* footnote(target, footnotes, opts = {}, bottom = null) {
 exports.footnote = footnote;
 exports.annotation = build('annotation', n => `*${n}`, 'h1, h2, h3, h4, h5, h6, aside.aside, hr');
 exports.reference = build('reference', (n, abbr) => `[${abbr || n}]`);
-function build(syntax, marker, splitter) {
+function build(syntax, marker, splitter = '_') {
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
   // 構文ごとに各1回の処理では不可能
   return function* (target, footnote, opts = {}, bottom = null) {
     const defs = new Map();
-    const buffer = new queue_1.MultiQueue();
-    const titles = new Map();
     const splitters = [];
-    for (let es = target.querySelectorAll(splitter ?? '_'), len = es.length, i = 0; i < len; ++i) {
+    for (let es = target.querySelectorAll(splitter), len = es.length, i = 0; i < len; ++i) {
+      if (i % 100 === 0) yield;
       const el = es[i];
       el.parentNode === target && splitters.push(el);
     }
+    const refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`);
+    const titles = new Map();
+    const contents = new Map();
+    for (let len = refs.length, i = 0; i < len; ++i) {
+      if (i % 10 === 9) yield;
+      const ref = refs[i];
+      const identifier = ref.getAttribute('data-abbr') || ` ${ref.firstElementChild.innerHTML}`;
+      if (titles.has(identifier)) continue;
+      const content = (0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes);
+      const title = (0, indexee_1.text)(content).trim();
+      if (!title) continue;
+      titles.set(identifier, title);
+      contents.set(identifier, content);
+    }
     let count = 0;
     let total = 0;
     let style;
-    for (let refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`), len = refs.length, i = 0; i < len; ++i) {
-      yield;
+    for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
       while (splitters.length > 0 && splitters[0].compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING) {
         if (defs.size > 0) {
@@ -7071,7 +7108,6 @@ function build(syntax, marker, splitter) {
       }
       const identifier = ref.getAttribute('data-abbr') || ` ${ref.firstElementChild.innerHTML}`;
       const abbr = ref.getAttribute('data-abbr') || undefined;
-      const content = (0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes);
       style ??= abbr ? 'abbr' : 'count';
       if (style === 'count' ? abbr : !abbr) {
         (0, dom_1.define)(ref, {
@@ -7093,29 +7129,14 @@ function build(syntax, marker, splitter) {
       } else {
         ref.lastChild?.remove();
       }
-      const title = titles.get(identifier) || (0, indexee_1.text)(content).trim() || undefined;
-      title ? !titles.has(identifier) && titles.set(identifier, title) : buffer.set(identifier, ref);
-      const blank = !!abbr && !content.firstChild;
+      const title = titles.get(identifier);
+      const content = (0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes);
       const refIndex = ++count;
       const refId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:ref:${refIndex}` : undefined;
       const def =  false || defs.get(identifier) || defs.set(identifier, (0, dom_1.html)('li', {
         id: opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${total + defs.size + 1}` : undefined,
         'data-marker': !footnote ? marker(total + defs.size + 1, abbr) : undefined
-      }, [content.cloneNode(true), (0, dom_1.html)('sup')])).get(identifier);
-      if (title && !blank && def.childNodes.length === 1) {
-        def.insertBefore(content.cloneNode(true), def.lastChild);
-        for (let refs = buffer.take(identifier, Infinity), i = 0; i < refs.length; ++i) {
-          const ref = refs[i];
-          if (ref.getAttribute('data-invalid-type') !== 'content') continue;
-          (0, dom_1.define)(ref, {
-            title,
-            class: void ref.classList.remove('invalid'),
-            'data-invalid-syntax': null,
-            'data-invalid-type': null,
-            'data-invalid-message': null
-          });
-        }
-      }
+      }, [contents.get(identifier) ?? (0, dom_1.frag)(), (0, dom_1.html)('sup')])).get(identifier);
       const defIndex = +def.id.slice(def.id.lastIndexOf(':') + 1) || total + defs.size;
       const defId = def.id || undefined;
       (0, dom_1.define)(ref, {
@@ -7135,7 +7156,7 @@ function build(syntax, marker, splitter) {
       }, marker(defIndex, abbr)));
       def.lastChild.appendChild((0, dom_1.html)('a', {
         href: refId && `#${refId}`,
-        title: abbr && !blank ? title : undefined
+        title: abbr && (0, indexee_1.text)(content).trim() || undefined
       }, `^${refIndex}`));
     }
     if (defs.size > 0 || footnote) {
@@ -8368,7 +8389,7 @@ function unlink(h) {
 /***/ 3252:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.315 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.317 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(true)
 		module.exports = factory();
@@ -8699,7 +8720,7 @@ exports.defrag = defrag;
 /***/ 6120:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.315 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.317 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(true)
 		module.exports = factory();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.268.0",
+  "version": "0.268.2",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -34,11 +34,11 @@
     "@types/mocha": "10.0.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.52.0",
+    "@typescript-eslint/parser": "^5.54.0",
     "babel-loader": "^9.1.2",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^7.6.0",
-    "eslint": "^8.34.0",
+    "eslint": "^8.35.0",
     "eslint-plugin-redos": "^4.4.5",
     "eslint-webpack-plugin": "^4.0.0",
     "glob": "^8.1.0",
@@ -49,11 +49,11 @@
     "karma-mocha": "^2.0.1",
     "karma-power-assert": "^1.0.0",
     "mocha": "^10.2.0",
-    "npm-check-updates": "^16.7.4",
+    "npm-check-updates": "^16.7.10",
     "semver": "^7.3.8",
     "spica": "0.0.719",
     "ts-loader": "^9.4.2",
-    "typed-dom": "^0.0.315",
+    "typed-dom": "^0.0.317",
     "typescript": "4.9.5",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",

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

@@ -30,7 +30,7 @@ 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', () => {
@@ -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

@@ -27,10 +27,10 @@ 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(
@@ -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/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);
     });

package/src/parser/block/ulist.ts

@@ -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/indexee.ts

@@ -14,12 +14,13 @@ export function identity(id: string | undefined, text: string, name: 'index' | '
   if (id === '') return undefined;
   text &&= text.trim().replace(/\s+/g, '_');
   if (text === '') return undefined;
-  if (text.length <= 100) return `${name}:${id ?? ''}:${text}`;
+  const cs = [...text];
+  if (cs.length <= 100) return `${name}:${id ?? ''}:${text}`;
   switch (name) {
     case 'index':
-      return `${name}:${id ?? ''}:${text.slice(0, 97)}...`;
+      return `${name}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
     case 'mark':
-      return `${name}:${id ?? ''}:${text.slice(0, 50)}...${text.slice(-47)}`;
+      return `${name}:${id ?? ''}:${cs.slice(0, 50).join('')}...${cs.slice(-47).join('')}`;
   }
   assert(false);
 }
@@ -33,6 +34,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),
           [

package/src/parser/processor/footnote.ts

@@ -1,5 +1,4 @@
 import { text } from '../inline/extension/indexee';
-import { MultiQueue } from 'spica/queue';
 import { frag, html, define } from 'typed-dom/dom';
 
 export function* footnote(
@@ -24,7 +23,7 @@ export const reference = build('reference', (n, abbr) => `[${abbr || n}]`);
 function build(
   syntax: 'annotation' | 'reference',
   marker: (index: number, abbr: string | undefined) => string,
-  splitter?: string,
+  splitter: string = '_',
 ) {
   assert(syntax.match(/^[a-z]+$/));
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
@@ -36,21 +35,31 @@ function build(
     bottom: Node | null = null,
   ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
     const defs = new Map<string, HTMLLIElement>();
-    const buffer = new MultiQueue<string, HTMLElement>();
-    const titles = new Map<string, string>();
     const splitters: Element[] = [];
-    for (let es = target.querySelectorAll(splitter ?? '_'),
+    for (let es = target.querySelectorAll(splitter),
              len = es.length, i = 0; i < len; ++i) {
+      if (i % 100 === 0) yield;
       const el = es[i];
       el.parentNode === target && splitters.push(el);
     }
+    const refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`);
+    const titles = new Map<string, string>();
+    const contents = new Map<string, DocumentFragment>();
+    for (let len = refs.length, i = 0; i < len; ++i) {
+      if (i % 10 === 9) yield;
+      const ref = refs[i];
+      const identifier = ref.getAttribute('data-abbr') || ` ${ref.firstElementChild!.innerHTML}`;
+      if (titles.has(identifier)) continue;
+      const content = frag(ref.firstElementChild!.cloneNode(true).childNodes);
+      const title = text(content).trim();
+      if (!title) continue;
+      titles.set(identifier, title);
+      contents.set(identifier, content);
+    }
     let count = 0;
     let total = 0;
     let style: 'count' | 'abbr';
-    for (
-      let refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`),
-          len = refs.length, i = 0; i < len; ++i) {
-      yield;
+    for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
       while (splitters.length > 0
           && splitters[0].compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING) {
@@ -65,7 +74,6 @@ function build(
       }
       const identifier = ref.getAttribute('data-abbr') || ` ${ref.firstElementChild!.innerHTML}`;
       const abbr = ref.getAttribute('data-abbr') || undefined;
-      const content = frag(ref.firstElementChild!.cloneNode(true).childNodes);
       style ??= abbr ? 'abbr' : 'count';
       if (style === 'count' ? abbr : !abbr) {
         define(ref, {
@@ -89,14 +97,10 @@ function build(
       else {
         ref.lastChild?.remove();
       }
-      const title = titles.get(identifier) || text(content).trim() || undefined;
+      const title = titles.get(identifier);
       assert(title !== '');
       assert(syntax !== 'annotation' || title);
-      title
-        ? !titles.has(identifier) && titles.set(identifier, title)
-        : buffer.set(identifier, ref);
-      assert(syntax !== 'annotation' || !buffer.has(identifier));
-      const blank = !!abbr && !content.firstChild;
+      const content = frag(ref.firstElementChild!.cloneNode(true).childNodes);
       const refIndex = ++count;
       const refId = opts.id !== ''
         ? `${syntax}:${opts.id ?? ''}:ref:${refIndex}`
@@ -108,24 +112,9 @@ function build(
               id: opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${total + defs.size + 1}` : undefined,
               'data-marker': !footnote ? marker(total + defs.size + 1, abbr) : undefined,
             },
-            [content.cloneNode(true), html('sup')]))
+            [contents.get(identifier) ?? frag(), html('sup')]))
             .get(identifier)!;
       assert(def.lastChild);
-      if (title && !blank && def.childNodes.length === 1) {
-        def.insertBefore(content.cloneNode(true), def.lastChild);
-        assert(def.childNodes.length > 1);
-        for (let refs = buffer.take(identifier, Infinity), i = 0; i < refs.length; ++i) {
-          const ref = refs[i];
-          if (ref.getAttribute('data-invalid-type') !== 'content') continue;
-          define(ref, {
-            title,
-            class: void ref.classList.remove('invalid'),
-            'data-invalid-syntax': null,
-            'data-invalid-type': null,
-            'data-invalid-message': null,
-          });
-        }
-      }
       const defIndex = +def.id.slice(def.id.lastIndexOf(':') + 1) || total + defs.size;
       const defId = def.id || undefined;
       define(ref, {
@@ -145,9 +134,7 @@ function build(
         html('a',
           {
             href: refId && `#${refId}`,
-            title: abbr && !blank
-              ? title
-              : undefined,
+            title: abbr && text(content).trim() || undefined,
           },
           `^${refIndex}`));
     }

package/src/util/info.ts

@@ -1,3 +1,4 @@
+import type { ParseSelector } from 'typed-query-selector/parser';
 import { Info } from '../..';
 import { scope } from './scope';
 
@@ -16,9 +17,10 @@ export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info
     media: find('.media[data-src]'),
   };
 
-  function find<T extends HTMLElement>(selector: string): T[] {
-    const acc: T[] = [];
-    for (let es = source.querySelectorAll<T>(selector),
+  function find<T extends string>(selector: T): ParseSelector<T, HTMLElement>[];
+  function find(selector: string): HTMLElement[] {
+    const acc = [];
+    for (let es = source.querySelectorAll<HTMLElement>(selector),
              len = es.length, i = 0; i < len; ++i) {
       const el = es[i];
       match(el) && acc.push(el);