securemark 0.274.3 → 0.275.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.275.0
+
+- Fix identifiers.
+
+## 0.274.4
+
+- Fix list item parser.
+
 ## 0.274.3
 
 - Fix abbr parser.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.274.3 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.275.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"));
@@ -5259,6 +5259,7 @@ const combinator_1 = __webpack_require__(2087);
 const ulist_1 = __webpack_require__(5425);
 const ilist_1 = __webpack_require__(238);
 const inline_1 = __webpack_require__(1160);
+const index_1 = __webpack_require__(4479);
 const source_1 = __webpack_require__(6743);
 const visibility_1 = __webpack_require__(7618);
 const memoize_1 = __webpack_require__(1808);
@@ -5269,8 +5270,11 @@ 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 => 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', {
+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 => idx(ms[1]), [])), (0, combinator_1.match)(openers['('], (0, memoize_1.memoize)(ms => list(type(ms[1]), '('), ms => idx(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, combinator_1.union)([(0, combinator_1.trim)((0, combinator_1.fmap)((0, combinator_1.close)((0, combinator_1.union)([index_1.index]), /^$/), ([el]) => [(0, dom_1.define)(el, {
+  class: void el.classList.add('indexer'),
+  'data-index': ''
+})])), (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)]);
 const heads = {
@@ -5291,7 +5295,7 @@ exports.invalid = (0, combinator_1.rewrite)((0, combinator_1.inits)([source_1.co
   'data-invalid-type': 'syntax',
   'data-invalid-message': 'Fix the indent or the head of the list item'
 }, source.replace('\n', ''))], '']);
-function index(value) {
+function idx(value) {
   switch (value) {
     case 'i':
       return 1;
@@ -5632,11 +5636,15 @@ const combinator_1 = __webpack_require__(2087);
 const olist_1 = __webpack_require__(7471);
 const ilist_1 = __webpack_require__(238);
 const inline_1 = __webpack_require__(1160);
+const index_1 = __webpack_require__(4479);
 const visibility_1 = __webpack_require__(7618);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
 exports.ulist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(/^-(?=[^\S\n]|\n[^\S\n]*\S)/, (0, combinator_1.state)(8 /* State.media */, exports.ulist_))));
-exports.ulist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^-(?=$|\s)/, (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)(/^-(?:$|\s)/, (0, combinator_1.subsequence)([exports.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)([exports.ulist_, olist_1.olist_, ilist_1.ilist_]))]), olist_1.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)(fillFirstLine(ns)))]), true)])))), es => [format((0, dom_1.html)('ul', es))])));
+exports.ulist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^-(?=$|\s)/, (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)(/^-(?:$|\s)/, (0, combinator_1.subsequence)([exports.checkbox, (0, combinator_1.union)([(0, combinator_1.trim)((0, combinator_1.fmap)((0, combinator_1.close)((0, combinator_1.union)([index_1.index]), /^$/), ([el]) => [(0, dom_1.define)(el, {
+  class: void el.classList.add('indexer'),
+  'data-index': ''
+})])), (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)([exports.ulist_, olist_1.olist_, ilist_1.ilist_]))]), olist_1.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)(fillFirstLine(ns)))]), true)])))), es => [format((0, dom_1.html)('ul', es))])));
 exports.checkbox = (0, combinator_1.creation)(1, false, (0, combinator_1.focus)(/^\[[xX ]\](?=$|\s)/, ({
   source
 }) => [[(0, dom_1.html)('span', {
@@ -6143,7 +6151,7 @@ exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[#', (0
   id: el.id ? null : undefined,
   class: 'index',
   href: el.id ? `#${el.id}` : undefined
-}, el.childNodes)])));
+})])));
 const signature = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, combinator_1.fmap)((0, combinator_1.open)('|', (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.txt]), ']'))), ns => [(0, dom_1.html)('span', {
   class: 'indexer',
   'data-index': (0, indexee_1.identity)(undefined, ns.join('')).slice(7)
@@ -6161,7 +6169,7 @@ const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, comb
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.text = exports.index = exports.identity = exports.indexee = void 0;
+exports.text = exports.signature = exports.index = exports.identity = exports.indexee = void 0;
 const combinator_1 = __webpack_require__(2087);
 const memoize_1 = __webpack_require__(1808);
 const dom_1 = __webpack_require__(3252);
@@ -6173,17 +6181,18 @@ function indexee(parser, optional) {
   })]);
 }
 exports.indexee = indexee;
-function identity(id, text, name = 'index') {
+function identity(id, text, type = 'index') {
   if (id === '') return undefined;
   text &&= text.trim().replace(/\s+/g, '_');
   if (text === '') return undefined;
+  if (text.length <= 100 || type === '') return `${type}:${id ?? ''}:${text}`;
   const cs = [...text];
-  if (cs.length <= 100) return `${name}:${id ?? ''}:${text}`;
-  switch (name) {
+  if (cs.length <= 100) return `${type}:${id ?? ''}:${text}`;
+  switch (type) {
     case 'index':
-      return `${name}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
+      return `${type}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
     case 'mark':
-      return `${name}:${id ?? ''}:${cs.slice(0, 50).join('')}...${cs.slice(-47).join('')}`;
+      return `${type}:${id ?? ''}:${cs.slice(0, 50).join('')}...${cs.slice(-47).join('')}`;
   }
 }
 exports.identity = identity;
@@ -6193,9 +6202,43 @@ function index(source, optional = false) {
   const index = indexer?.getAttribute('data-index');
   if (index) return index;
   if (index === '' && optional) return '';
-  return (0, exports.text)(source);
+  return signature(source);
 }
 exports.index = index;
+function signature(source) {
+  const target = source.cloneNode(true);
+  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .label[data-label], .comment, rt, rp, br, .annotation, .reference, .checkbox, ul, ol'), len = es.length, i = 0; i < len; ++i) {
+    const el = es[i];
+    switch (el.tagName) {
+      case 'CODE':
+        el.replaceWith(el.getAttribute('data-src'));
+        continue;
+      case 'RT':
+      case 'RP':
+      case 'BR':
+      case 'UL':
+      case 'OL':
+        el.remove();
+        continue;
+    }
+    switch (el.className) {
+      case 'math':
+        el.replaceWith(el.getAttribute('data-src'));
+        continue;
+      case 'label':
+        el.replaceWith(`[$${el.getAttribute('data-label').replace('$', '')}]`);
+        continue;
+      case 'comment':
+      case 'checkbox':
+      case 'annotation':
+      case 'reference':
+        el.remove();
+        continue;
+    }
+  }
+  return target.textContent.trim();
+}
+exports.signature = signature;
 exports.text = (0, memoize_1.reduce)(source => {
   const target = source.cloneNode(true);
   for (let es = target.querySelectorAll('code[data-src], .math[data-src], .comment, rt, rp, br, .annotation, .reference, .checkbox, ul, ol'), len = es.length, i = 0; i < len; ++i) {
@@ -6224,8 +6267,6 @@ exports.text = (0, memoize_1.reduce)(source => {
         continue;
     }
   }
-  // Better:
-  //return target.innerText;
   return target.textContent;
 });
 
@@ -6586,7 +6627,7 @@ exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, sourc
 }) => {
   const el = (0, dom_1.html)('mark', (0, dom_1.defrag)(bs));
   return [[(0, dom_1.define)(el, {
-    id: state & (256 /* State.annotation */ | 128 /* State.reference */) ? undefined : (0, indexee_1.identity)(id, (0, indexee_1.text)(el), 'mark')
+    id: state & (256 /* State.annotation */ | 128 /* State.reference */) ? undefined : (0, indexee_1.identity)(id, (0, indexee_1.signature)(el), 'mark')
   }), el.id && (0, dom_1.html)('a', {
     href: `#${el.id}`
   })], rest];
@@ -7106,7 +7147,7 @@ function build(syntax, marker, splitter = '') {
         }
       }
       const abbr = ref.getAttribute('data-abbr') || undefined;
-      const identifier = (0, indexee_1.identity)(undefined, abbr ? abbr.match(/^(?:\S+ )+?(?:(?:January|February|March|April|May|June|August|September|October|November|December) \d{1,2}(?:-\d{0,2})?, \d{1,4}(?:-\d{0,4})?[a-z]?|n\.d\.)(?=,|$)/)?.[0] ?? abbr.match(/^[^,\s]+(?:,? [^,\s]+)*?(?: \d{1,4}(?:-\d{0,4})?[a-z]?(?=,|$)|(?=,(?: [a-z]+\.?)? [0-9]))/)?.[0] ?? abbr : (0, indexee_1.text)(ref.firstElementChild), 'mark')?.slice(6) || '';
+      const identifier = abbr ? (0, indexee_1.identity)(undefined, abbr.match(/^(?:\S+ )+?(?:(?:January|February|March|April|May|June|August|September|October|November|December) \d{1,2}(?:-\d{0,2})?, \d{1,4}(?:-\d{0,4})?[a-z]?|n\.d\.)(?=,|$)/)?.[0] ?? abbr.match(/^[^,\s]+(?:,? [^,\s]+)*?(?: \d{1,4}(?:-\d{0,4})?[a-z]?(?=,|$)|(?=,(?: [a-z]+\.?)? [0-9]))/)?.[0] ?? abbr, '')?.slice(2) || '' : (0, indexee_1.identity)(undefined, (0, indexee_1.signature)(ref.firstElementChild), 'mark')?.slice(6) || '';
       const refSubindex = refSubindexes.get(identifier) + 1 || 1;
       refSubindexes.set(identifier, refSubindex);
       const refId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:ref:${identifier}:${refSubindex}` : undefined;
@@ -7123,7 +7164,7 @@ function build(syntax, marker, splitter = '') {
       initial && defs.set(identifier, def);
       const defIndex = initial ? total + defs.size : defIndexes.get(def);
       initial && defIndexes.set(def, defIndex);
-      const title = initial ? (0, indexee_1.text)(ref.firstElementChild) : titles.get(identifier);
+      const title = initial ? (0, indexee_1.text)(ref.firstElementChild).trim() : titles.get(identifier);
       initial && titles.set(identifier, title);
       ref.firstElementChild.hasAttribute('hidden') ? ref.lastElementChild.remove() : ref.firstElementChild.setAttribute('hidden', '');
       (0, dom_1.define)(ref, {
@@ -7150,7 +7191,7 @@ function build(syntax, marker, splitter = '') {
       }, marker(defIndex, abbr)));
       def.lastElementChild.appendChild((0, dom_1.html)('a', {
         href: refId && `#${refId}`,
-        title: abbr && (0, indexee_1.text)((0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes)).trim() || undefined
+        title: abbr && (initial ? title : (0, indexee_1.text)(ref.firstElementChild).trim()) || undefined
       }, `^${++refIndex}`));
     }
     if (note || defs.size > 0) {
@@ -8409,7 +8450,7 @@ function unlink(h) {
 /***/ 3252:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.330 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.333 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();
@@ -8522,7 +8563,7 @@ exports.reduce = reduce;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.defrag = exports.prepend = exports.append = exports.isChildren = exports.define = exports.element = exports.text = exports.svg = exports.html = exports.frag = exports.shadow = void 0;
+exports.defrag = exports.prepend = exports.append = exports.isChildren = exports.define = exports.element = exports.text = exports.math = exports.svg = exports.html = exports.frag = exports.shadow = void 0;
 const alias_1 = __nested_webpack_require_4668__(5406);
 const memoize_1 = __nested_webpack_require_4668__(1808);
 var caches;
@@ -8547,6 +8588,7 @@ function frag(children) {
 exports.frag = frag;
 exports.html = element(document, "HTML" /* NS.HTML */);
 exports.svg = element(document, "SVG" /* NS.SVG */);
+exports.math = element(document, "MathML" /* NS.Math */);
 function text(source) {
   return document.createTextNode(source);
 }
@@ -8558,7 +8600,7 @@ function element(context, ns) {
 }
 exports.element = element;
 function elem(context, ns, tag, attrs) {
-  if (!('createElement' in context)) throw new Error(`TypedDOM: Scoped custom elements are not supported on this browser.`);
+  if (!('createElement' in context)) throw new Error(`TypedDOM: Scoped custom elements are not supported on this browser`);
   const opts = 'is' in attrs ? {
     is: attrs['is']
   } : undefined;
@@ -8567,7 +8609,7 @@ function elem(context, ns, tag, attrs) {
       return context.createElement(tag, opts);
     case "SVG" /* NS.SVG */:
       return context.createElementNS('http://www.w3.org/2000/svg', tag, opts);
-    case "MathML" /* NS.MathML */:
+    case "MathML" /* NS.Math */:
       return context.createElementNS('http://www.w3.org/1998/Math/MathML', tag, opts);
   }
 }
@@ -8609,10 +8651,10 @@ function defineAttrs(el, attrs) {
         }
         continue;
       case 'function':
-        if (name.length < 3) throw new Error(`TypedDOM: Attribute names for event listeners must have an event name but got "${name}".`);
+        if (name.length < 3) throw new Error(`TypedDOM: Attribute names for event listeners must have an event name but got "${name}"`);
         const names = name.split(/\s+/);
         for (const name of names) {
-          if (!name.startsWith('on')) throw new Error(`TypedDOM: Attribute names for event listeners must start with "on" but got "${name}".`);
+          if (!name.startsWith('on')) throw new Error(`TypedDOM: Attribute names for event listeners must start with "on" but got "${name}"`);
           const type = name.slice(2).toLowerCase();
           el.addEventListener(type, value, {
             passive: ['wheel', 'mousewheel', 'touchstart', 'touchmove', 'touchend', 'touchcancel'].includes(type)
@@ -8708,7 +8750,7 @@ exports.defrag = defrag;
 /******/ 	var __webpack_module_cache__ = {};
 /******/ 	
 /******/ 	// The require function
-/******/ 	function __nested_webpack_require_11589__(moduleId) {
+/******/ 	function __nested_webpack_require_11657__(moduleId) {
 /******/ 		// Check if module is in cache
 /******/ 		var cachedModule = __webpack_module_cache__[moduleId];
 /******/ 		if (cachedModule !== undefined) {
@@ -8722,7 +8764,7 @@ exports.defrag = defrag;
 /******/ 		};
 /******/ 	
 /******/ 		// Execute the module function
-/******/ 		__webpack_modules__[moduleId](module, module.exports, __nested_webpack_require_11589__);
+/******/ 		__webpack_modules__[moduleId](module, module.exports, __nested_webpack_require_11657__);
 /******/ 	
 /******/ 		// Return the exports of the module
 /******/ 		return module.exports;
@@ -8733,7 +8775,7 @@ exports.defrag = defrag;
 /******/ 	// startup
 /******/ 	// Load entry module and return exports
 /******/ 	// This entry module is referenced by other modules so it can't be inlined
-/******/ 	var __nested_webpack_exports__ = __nested_webpack_require_11589__(7521);
+/******/ 	var __nested_webpack_exports__ = __nested_webpack_require_11657__(7521);
 /******/ 	
 /******/ 	return __nested_webpack_exports__;
 /******/ })()
@@ -8745,7 +8787,7 @@ exports.defrag = defrag;
 /***/ 6120:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.330 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.333 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/markdown.d.ts

@@ -118,8 +118,13 @@ export namespace MarkdownParser {
           Parser<HTMLElement | string, Context, [
             InlineParser,
             Parser<HTMLElement | string, Context, [
-              InlineParser.ExtensionParser.IndexerParser,
-              InlineParser,
+              Parser<HTMLElement, Context, [
+                InlineParser.ExtensionParser.IndexParser,
+              ]>,
+              Parser<HTMLElement | string, Context, [
+                InlineParser.ExtensionParser.IndexerParser,
+                InlineParser,
+              ]>,
             ]>,
           ]>,
           Parser<HTMLUListElement | HTMLOListElement, Context, [
@@ -153,8 +158,13 @@ export namespace MarkdownParser {
           Parser<HTMLElement | string, Context, [
             InlineParser,
             Parser<HTMLElement | string, Context, [
-              InlineParser.ExtensionParser.IndexerParser,
-              InlineParser,
+              Parser<HTMLElement, Context, [
+                InlineParser.ExtensionParser.IndexParser,
+              ]>,
+              Parser<HTMLElement | string, Context, [
+                InlineParser.ExtensionParser.IndexerParser,
+                InlineParser,
+              ]>,
             ]>,
           ]>,
           Parser<HTMLUListElement | HTMLOListElement, Context, [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.274.3",
+  "version": "0.275.0",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -34,14 +34,14 @@
     "@types/mocha": "10.0.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.59.0",
+    "@typescript-eslint/parser": "^5.59.5",
     "babel-loader": "^9.1.2",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^8.0.1",
-    "eslint": "^8.39.0",
+    "eslint": "^8.40.0",
     "eslint-plugin-redos": "^4.4.5",
     "eslint-webpack-plugin": "^4.0.1",
-    "glob": "^10.2.1",
+    "glob": "^10.2.3",
     "karma": "^6.4.2",
     "karma-chrome-launcher": "^3.2.0",
     "karma-coverage": "^2.2.0",
@@ -49,14 +49,14 @@
     "karma-mocha": "^2.0.1",
     "karma-power-assert": "^1.0.0",
     "mocha": "^10.2.0",
-    "npm-check-updates": "^16.10.9",
+    "npm-check-updates": "^16.10.12",
     "semver": "^7.5.0",
     "spica": "0.0.721",
     "ts-loader": "^9.4.2",
-    "typed-dom": "^0.0.330",
+    "typed-dom": "^0.0.333",
     "typescript": "5.0.4",
-    "webpack": "^5.80.0",
-    "webpack-cli": "^5.0.2",
+    "webpack": "^5.82.0",
+    "webpack-cli": "^5.1.1",
     "webpack-merge": "^5.8.0"
   },
   "scripts": {

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

@@ -207,8 +207,8 @@ describe('Unit: parser/api/parse', () => {
         [...parse('$-a\n$$\n$$\n\n(($-a[[^B]]))[[^B|$-a]]', { notes }).children].map(el => el.outerHTML),
         [
           '<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><sup class="annotation" id="annotation::ref:(1):1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="B"><span></span></sup></span><a href="#annotation::def:(1):1">*1</a></sup><sup class="reference" data-abbr="B" id="reference::ref:B:1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><a href="#reference::def:B">[B]</a></sup></p>',
-          '<ol class="annotations"><li id="annotation::def:(1):1" data-marker="*1"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="B" id="reference::ref:B:2" title="(1)"><span hidden=""></span><a href="#reference::def:B">[B]</a></sup></span><sup><a href="#annotation::ref:(1):1">^1</a></sup></li></ol>',
+          '<p><sup class="annotation" id="annotation::ref:[$-a]:1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="B"><span></span></sup></span><a href="#annotation::def:[$-a]:1">*1</a></sup><sup class="reference" data-abbr="B" id="reference::ref:B:1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><a href="#reference::def:B">[B]</a></sup></p>',
+          '<ol class="annotations"><li id="annotation::def:[$-a]:1" data-marker="*1"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="B" id="reference::ref:B:2" title="(1)"><span hidden=""></span><a href="#reference::def:B">[B]</a></sup></span><sup><a href="#annotation::ref:[$-a]:1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(
         notes.references.outerHTML,

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

@@ -127,10 +127,10 @@ describe('Unit: parser/block/olist', () => {
     });
 
     it('indexer', () => {
-      assert.deepStrictEqual(inspect(parser('1. [#a]')), [['<ol><li id="index::a"><a class="index" href="#index::a">a</a></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser('1. [#a]')), [['<ol><li><a class="index indexer" href="#index::a" data-index="">a</a></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('1. a [#]')), [['<ol><li>a<span class="indexer" data-index=""></span></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('1. a [#b]')), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser('1. [ ] [#a]')), [['<ol class="checklist"><li id="index::a"><span class="checkbox">☐</span><a class="index" href="#index::a">a</a></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser('1. [ ] [#a]')), [['<ol class="checklist"><li><span class="checkbox">☐</span><a class="index indexer" href="#index::a" data-index="">a</a></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('1. [ ] a [#b]')), [['<ol class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('1. a [#]\n 1. c [#d]')), [['<ol><li>a<span class="indexer" data-index=""></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('1. a [#b]\n 1. c [#d]')), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);

package/src/parser/block/olist.ts

@@ -1,9 +1,10 @@
 import { OListParser } from '../block';
 import { Parser } from '../../combinator/data/parser';
-import { union, inits, subsequence, some, creation, state, block, line, validate, indent, focus, rewrite, open, match, fallback, lazy, fmap } from '../../combinator';
+import { union, inits, subsequence, some, creation, state, block, line, validate, indent, focus, rewrite, open, close, match, trim, fallback, lazy, fmap } from '../../combinator';
 import { checkbox, ulist_, fillFirstLine } from './ulist';
 import { ilist_ } from './ilist';
 import { inline, indexee, indexer } from '../inline';
+import { index } from '../inline/extension/index';
 import { contentline } from '../source';
 import { State } from '../context';
 import { visualize, trimBlank } from '../visibility';
@@ -27,17 +28,22 @@ export const olist: OListParser = lazy(() => block(validate(
 export const olist_: OListParser = lazy(() => block(union([
   match(
     openers['.'],
-    memoize(ms => list(type(ms[1]), '.'), ms => index(ms[1]), [])),
+    memoize(ms => list(type(ms[1]), '.'), ms => idx(ms[1]), [])),
   match(
     openers['('],
-    memoize(ms => list(type(ms[1]), '('), ms => index(ms[1]), [])),
+    memoize(ms => list(type(ms[1]), '('), ms => idx(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(visualize(some(union([indexer, inline]))))]), true)),
+        line(open(heads[form], subsequence([checkbox, union([
+          trim(fmap(close(union([index]), /^$/), ([el]) => [
+            define(el, { class: void el.classList.add('indexer'), 'data-index': '' })
+          ])),
+          trimBlank(visualize(some(union([indexer, inline])))),
+        ])]), true)),
         indent(union([ulist_, olist_, ilist_])),
       ]),
       invalid),
@@ -67,7 +73,7 @@ export const invalid = rewrite(
     }, source.replace('\n', ''))
   ], '']);
 
-function index(value: string): number {
+function idx(value: string): number {
   switch (value) {
     case 'i':
       return 1;

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

@@ -67,10 +67,10 @@ describe('Unit: parser/block/ulist', () => {
     });
 
     it('indexer', () => {
-      assert.deepStrictEqual(inspect(parser('- [#a]')), [['<ul><li id="index::a"><a class="index" href="#index::a">a</a></li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- [#a]')), [['<ul><li><a class="index indexer" href="#index::a" data-index="">a</a></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- a [#]')), [['<ul><li>a<span class="indexer" data-index=""></span></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- a [#b]')), [['<ul><li id="index::b">a<span class="indexer" data-index="b"></span></li></ul>'], '']);
-      assert.deepStrictEqual(inspect(parser('- [ ] [#a]')), [['<ul class="checklist"><li id="index::a"><span class="checkbox">☐</span><a class="index" href="#index::a">a</a></li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- [ ] [#a]')), [['<ul class="checklist"><li><span class="checkbox">☐</span><a class="index indexer" href="#index::a" data-index="">a</a></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- [ ] a [#b]')), [['<ul class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- a [#]\n - c [#d]')), [['<ul><li>a<span class="indexer" data-index=""></span><ul><li id="index::d">c<span class="indexer" data-index="d"></span></li></ul></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- a [#b]\n - c [#d]')), [['<ul><li id="index::b">a<span class="indexer" data-index="b"></span><ul><li id="index::d">c<span class="indexer" data-index="d"></span></li></ul></li></ul>'], '']);

package/src/parser/block/ulist.ts

@@ -1,12 +1,13 @@
 import { UListParser } from '../block';
-import { union, inits, subsequence, some, creation, state, block, line, validate, indent, focus, open, fallback, lazy, fmap } from '../../combinator';
+import { union, inits, subsequence, some, creation, state, block, line, validate, indent, focus, open, close, trim, fallback, lazy, fmap } from '../../combinator';
 import { olist_, invalid } from './olist';
 import { ilist_ } from './ilist';
 import { inline, indexer, indexee } from '../inline';
+import { index } from '../inline/extension/index';
 import { State } from '../context';
 import { visualize, trimBlank } from '../visibility';
 import { unshift } from 'spica/array';
-import { html, defrag } from 'typed-dom/dom';
+import { html, define, defrag } from 'typed-dom/dom';
 
 export const ulist: UListParser = lazy(() => block(validate(
   /^-(?=[^\S\n]|\n[^\S\n]*\S)/,
@@ -18,7 +19,12 @@ export const ulist_: UListParser = lazy(() => block(fmap(validate(
   some(creation(1, false, union([
     indexee(fmap(fallback(
       inits([
-        line(open(/^-(?:$|\s)/, subsequence([checkbox, trimBlank(visualize(some(union([indexer, inline]))))]), true)),
+        line(open(/^-(?:$|\s)/, subsequence([checkbox, union([
+          trim(fmap(close(union([index]), /^$/), ([el]) => [
+            define(el, { class: void el.classList.add('indexer'), 'data-index': '' })
+          ])),
+          trimBlank(visualize(some(union([indexer, inline])))),
+        ])]), true)),
         indent(union([ulist_, olist_, ilist_])),
       ]),
       invalid),

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

@@ -27,8 +27,7 @@ export const index: IndexParser = lazy(() => validate('[#', fmap(indexee(surroun
         id: el.id ? null : undefined,
         class: 'index',
         href: el.id ? `#${el.id}` : undefined,
-      },
-      el.childNodes),
+      }),
   ])));
 
 const signature: IndexParser.SignatureParser = lazy(() => creation(fmap(open(

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

@@ -9,19 +9,20 @@ export function indexee(parser: Parser<HTMLElement, MarkdownParser.Context>, opt
   return fmap(parser, ([el], _, { id }) => [define(el, { id: identity(id, index(el, optional)) })]);
 }
 
-export function identity(id: string | undefined, text: string, name: 'index' | 'mark' = 'index'): string | undefined {
+export function identity(id: string | undefined, text: string, type: '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, '_');
   if (text === '') return undefined;
+  if (text.length <= 100 || type === '') return `${type}:${id ?? ''}:${text}`;
   const cs = [...text];
-  if (cs.length <= 100) return `${name}:${id ?? ''}:${text}`;
-  switch (name) {
+  if (cs.length <= 100) return `${type}:${id ?? ''}:${text}`;
+  switch (type) {
     case 'index':
-      return `${name}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
+      return `${type}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
     case 'mark':
-      return `${name}:${id ?? ''}:${cs.slice(0, 50).join('')}...${cs.slice(-47).join('')}`;
+      return `${type}:${id ?? ''}:${cs.slice(0, 50).join('')}...${cs.slice(-47).join('')}`;
   }
   assert(false);
 }
@@ -32,7 +33,7 @@ assert(identity(undefined, '0'.repeat(100 - 1) + 1, 'mark')!.slice(6) === '0'.re
 assert(identity(undefined, '0'.repeat(100) + 1, 'mark')!.slice(6) === '0'.repeat(50) + '...' + '0'.repeat(47 - 1) + 1);
 assert(identity(undefined, '0'.repeat(200) + 1, 'mark')!.slice(6) === '0'.repeat(50) + '...' + '0'.repeat(47 - 1) + 1);
 
-export function index(source: Element | DocumentFragment, optional = false): string {
+export function index(source: Element, optional = false): string {
   assert(source instanceof DocumentFragment || !source.matches('.indexer'));
   assert(source.querySelectorAll(':scope > .indexer').length <= 1);
   if (!source.firstChild) return '';
@@ -40,7 +41,43 @@ export function index(source: Element | DocumentFragment, optional = false): str
   const index = indexer?.getAttribute('data-index');
   if (index) return index;
   if (index === '' && optional) return '';
-  return text(source);
+  return signature(source);
+}
+
+export function signature(source: Element | DocumentFragment): string {
+  assert(!navigator.userAgent.includes('Chrome') || !source.querySelector('br:not(:has(+ :is(ul, ol)))'));
+  const target = source.cloneNode(true) as typeof source;
+  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .label[data-label], .comment, rt, rp, br, .annotation, .reference, .checkbox, ul, ol'),
+           len = es.length, i = 0; i < len; ++i) {
+    const el = es[i];
+    switch (el.tagName) {
+      case 'CODE':
+        el.replaceWith(el.getAttribute('data-src')!);
+        continue;
+      case 'RT':
+      case 'RP':
+      case 'BR':
+      case 'UL':
+      case 'OL':
+        el.remove();
+        continue;
+    }
+    switch (el.className) {
+      case 'math':
+        el.replaceWith(el.getAttribute('data-src')!);
+        continue;
+      case 'label':
+        el.replaceWith(`[$${el.getAttribute('data-label')!.replace('$', '')}]`);
+        continue;
+      case 'comment':
+      case 'checkbox':
+      case 'annotation':
+      case 'reference':
+        el.remove();
+        continue;
+    }
+  }
+  return target.textContent!.trim();
 }
 
 export const text = reduce((source: Element | DocumentFragment): string => {
@@ -73,7 +110,5 @@ export const text = reduce((source: Element | DocumentFragment): string => {
         continue;
     }
   }
-  // Better:
-  //return target.innerText;
   return target.textContent!;
 });

package/src/parser/inline/mark.ts

@@ -1,7 +1,7 @@
 import { MarkParser } from '../inline';
 import { union, some, syntax, constraint, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
-import { identity, text } from './extension/indexee';
+import { identity, signature } from './extension/indexee';
 import { str } from '../source';
 import { startTight, blankWith } from '../visibility';
 import { Syntax, State } from '../context';
@@ -23,7 +23,7 @@ export const mark: MarkParser = lazy(() => surround(
       define(el, {
         id: state! & (State.annotation | State.reference)
           ? undefined
-          : identity(id, text(el), 'mark'),
+          : identity(id, signature(el), 'mark'),
       }),
       el.id && html('a', { href: `#${el.id}` }),
     ], rest];

package/src/parser/inline/reference.ts

@@ -39,10 +39,7 @@ function attributes(ns: (string | HTMLElement)[]): Record<string, string | undef
     case '\n':
       const abbr = ns[1] as string;
       ns[0] = ns[1] = '';
-      return {
-        class: 'reference',
-        'data-abbr': abbr,
-      };
+      return { class: 'reference', 'data-abbr': abbr };
     default:
       return { class: 'reference' };
   }

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

@@ -1,9 +1,10 @@
 import { figure } from './figure';
+import { ParserOptions } from '../../..';
 import { parse as parse_ } from '../../parser';
 import { html } from 'typed-dom/dom';
 import { normalize } from '../../debug.test';
 
-const parse = (s: string) => parse_(s, { test: true });
+const parse = (s: string, o?: ParserOptions) => parse_(s, { test: true, ...o });
 
 describe('Unit: parser/processor/figure', () => {
   describe('figure', () => {
@@ -278,15 +279,17 @@ describe('Unit: parser/processor/figure', () => {
     it('id', () => {
       const target = parse([
         '$test-a\n> ',
-        '$test-a',
-      ].join('\n\n'));
+        '==$test-a==',
+        '- $test-a',
+      ].join('\n\n'), { id: '0' });
       for (let i = 0; i < 3; ++i) {
         [...figure(target, undefined, { id: '0' })];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
             '<figure data-type="quote" data-label="test-a" data-group="test" data-number="1" id="label:0:test-a"><figcaption><span class="figindex">Test 1. </span><span class="figtext"></span></figcaption><div><blockquote></blockquote></div></figure>',
-            '<p><a class="label" data-label="test-a" href="#label:0:test-a">Test 1</a></p>',
+            '<p><mark id="mark:0:[$test-a]"><a class="label" data-label="test-a" href="#label:0:test-a">Test 1</a></mark><a href="#mark:0:[$test-a]"></a></p>',
+            '<ul><li id="index:0:[$test-a]"><a class="label" data-label="test-a" href="#label:0:test-a">Test 1</a></li></ul>',
           ]);
       }
     });

package/src/parser/processor/note.ts

@@ -1,6 +1,6 @@
-import { identity, text } from '../inline/extension/indexee';
+import { identity, signature, text } from '../inline/extension/indexee';
 import { markInvalid, unmarkInvalid } from '../util';
-import { frag, html, define } from 'typed-dom/dom';
+import { html, define } from 'typed-dom/dom';
 
 export function* note(
   target: ParentNode & Node,
@@ -70,15 +70,16 @@ function build(
         }
       }
       const abbr = ref.getAttribute('data-abbr') || undefined;
-      const identifier = identity(
-        undefined,
-        abbr
-          ? abbr.match(/^(?:\S+ )+?(?:(?:January|February|March|April|May|June|August|September|October|November|December) \d{1,2}(?:-\d{0,2})?, \d{1,4}(?:-\d{0,4})?[a-z]?|n\.d\.)(?=,|$)/)?.[0] ??
-            abbr.match(/^[^,\s]+(?:,? [^,\s]+)*?(?: \d{1,4}(?:-\d{0,4})?[a-z]?(?=,|$)|(?=,(?: [a-z]+\.?)? [0-9]))/)?.[0] ??
-            abbr
-          : text(ref.firstElementChild!),
-        'mark')
-        ?.slice(6) || '';
+      const identifier = abbr
+        ? identity(
+            undefined,
+            (
+              abbr.match(/^(?:\S+ )+?(?:(?:January|February|March|April|May|June|August|September|October|November|December) \d{1,2}(?:-\d{0,2})?, \d{1,4}(?:-\d{0,4})?[a-z]?|n\.d\.)(?=,|$)/)?.[0] ??
+              abbr.match(/^[^,\s]+(?:,? [^,\s]+)*?(?: \d{1,4}(?:-\d{0,4})?[a-z]?(?=,|$)|(?=,(?: [a-z]+\.?)? [0-9]))/)?.[0] ??
+              abbr
+            ),
+            '')?.slice(2) || ''
+        : identity(undefined, signature(ref.firstElementChild!), 'mark')?.slice(6) || '';
       const refSubindex = refSubindexes.get(identifier)! + 1 || 1;
       refSubindexes.set(identifier, refSubindex);
       const refId = opts.id !== ''
@@ -107,7 +108,7 @@ function build(
         : defIndexes.get(def)!;
       initial && defIndexes.set(def, defIndex);
       const title = initial
-        ? text(ref.firstElementChild!)
+        ? text(ref.firstElementChild!).trim()
         : titles.get(identifier)!;
       initial && titles.set(identifier, title);
       assert(syntax !== 'annotation' || title);
@@ -139,7 +140,7 @@ function build(
         html('a',
           {
             href: refId && `#${refId}`,
-            title: abbr && text(frag(ref.firstElementChild!.cloneNode(true).childNodes)).trim() || undefined,
+            title: abbr && (initial ? title : text(ref.firstElementChild!).trim()) || undefined,
           },
           `^${++refIndex}`));
     }