securemark 0.298.0 → 0.298.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.298.2
+
+- Refactoring.
+
+## 0.298.1
+
+- Refactoring.
+
 ## 0.298.0
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.298.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.298.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"));
@@ -4518,6 +4518,7 @@ function parse(source, options = {}, context) {
     host: options.host ?? context?.host ?? new url_1.ReadonlyURL(location.pathname, location.origin),
     url: url ? new url_1.ReadonlyURL(url) : context?.url,
     id: options.id ?? context?.id,
+    local: options.local ?? context?.local,
     caches: context?.caches,
     resources: context?.resources
   });
@@ -4713,7 +4714,8 @@ const markdown = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combina
     class: 'references'
   });
   const document = (0, parse_1.parse)(source, {
-    id: '',
+    local: true,
+    id: context.id === '' ? '' : (0, util_1.randomID)(),
     notes: {
       references
     }
@@ -4867,7 +4869,8 @@ exports.aside = (0, combinator_1.block)((0, combinator_1.recursion)(0 /* Recursi
     class: 'references'
   });
   const document = (0, parse_1.parse)(body.slice(0, -1), {
-    id: '',
+    local: true,
+    id: context.id === '' ? '' : (0, util_1.randomID)(),
     notes: {
       references
     }
@@ -4918,7 +4921,8 @@ exports.example = (0, combinator_1.block)((0, combinator_1.recursion)(0 /* Recur
           class: 'references'
         });
         const document = (0, parse_1.parse)(body.slice(0, -1), {
-          id: '',
+          local: true,
+          id: context.id === '' ? '' : (0, util_1.randomID)(),
           notes: {
             references
           }
@@ -6014,8 +6018,9 @@ class Context extends parser_1.Context {
     this.recursion = new RecursionCounter('annotation', 2);
     const {
       segment,
-      buffer,
+      local,
       sequential,
+      buffer,
       header,
       host,
       url,
@@ -6023,8 +6028,9 @@ class Context extends parser_1.Context {
       caches
     } = options;
     this.segment = segment ?? 0 /* Segment.unknown */;
-    this.buffer = buffer ?? new parser_1.List();
+    this.local = local ?? false;
     this.sequential = sequential ?? false;
+    this.buffer = buffer ?? new parser_1.List();
     this.header = header ?? true;
     this.host = host;
     this.url = url;
@@ -6306,7 +6312,6 @@ exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(1
   const {
     source,
     position,
-    range,
     linebreak,
     recursion,
     resources
@@ -6354,12 +6359,10 @@ exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(1
   if (source[context.position] === ')') {
     bs.push(new parser_1.Node(')'));
     context.position += 1;
+    context.range += 1;
   }
-  const str = linebreak === 0 ? source.slice(position - range + 2, position) : '';
-  bs = linebreak === 0 && (str === '' || bracket_1.indexA.test(str)) ? new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
-    class: 'paren'
-  }, (0, dom_1.defrag)((0, util_1.unwrap)(bs))))]) : new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
-    class: 'bracket'
+  bs = new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
+    class: (0, bracket_1.bracketname)(context, bracket_1.indexA, 2, context.position - position)
   }, (0, dom_1.defrag)((0, util_1.unwrap)(bs))))]);
   bs.unshift(new parser_1.Node('('));
   const cs = parser(context);
@@ -6656,7 +6659,7 @@ const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combin
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.bracket = exports.indexA = void 0;
+exports.bracket = exports.bracketname = exports.indexA = void 0;
 const parser_1 = __webpack_require__(605);
 const combinator_1 = __webpack_require__(3484);
 const inline_1 = __webpack_require__(7973);
@@ -6664,8 +6667,19 @@ const link_1 = __webpack_require__(3628);
 const source_1 = __webpack_require__(8745);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.indexA = /^[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*$/;
-const indexF = new RegExp(exports.indexA.source.replace(', ', '[，、]').replace(/[09AZaz.]|\-(?!\w)/g, c => String.fromCodePoint(c.codePointAt(0) + 0xFEE0)));
+exports.indexA = /[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*/y;
+const indexF = new RegExp(exports.indexA.source.replace(', ', '[，、]').replace(/[09AZaz.]|\-(?!\w)/g, c => String.fromCodePoint(c.codePointAt(0) + 0xFEE0)), 'y');
+function bracketname(context, syntax, opener, closer) {
+  const {
+    source,
+    position,
+    range,
+    linebreak
+  } = context;
+  syntax.lastIndex = position - range + opener;
+  return range - opener - closer === 0 || linebreak === 0 && range - opener - closer <= 16 && syntax.test(source) && syntax.lastIndex === position - closer ? 'paren' : 'bracket';
+}
+exports.bracketname = bracketname;
 exports.bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([input => {
   const {
     source,
@@ -6688,58 +6702,16 @@ exports.bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([input =>
       return d1(input);
   }
 }]));
-const p1 = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.precedence)(1, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, ')', [[')', 1]]))), (0, source_1.str)(')'), true, [], ([as, bs = [], cs], {
-  source,
-  position,
-  range,
-  linebreak
-}) => {
-  const str = linebreak === 0 ? source.slice(position - range + 1, position - 1) : '';
-  return linebreak === 0 && (str === '' || exports.indexA.test(str)) ? new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
-    class: 'paren'
-  }, `(${str})`))]) : new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
-    class: 'bracket'
-  }, (0, dom_1.defrag)((0, util_1.unwrap)(as.import(bs).import(cs)))))]);
-}, ([as, bs = new parser_1.List()], context) => {
-  const {
-    source,
-    position,
-    range,
-    linebreak
-  } = context;
-  const str = linebreak === 0 ? source.slice(position - range + 1, position) : '';
-  return linebreak === 0 && (str === '' || exports.indexA.test(str)) ? new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
-    class: 'paren'
-  }, `(${str}`))]) : new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
-    class: 'bracket'
-  }, (0, dom_1.defrag)((0, util_1.unwrap)(as.import(bs)))))]);
-}));
-const p2 = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('（'), (0, combinator_1.precedence)(1, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, '）', [['）', 1]]))), (0, source_1.str)('）'), true, [], ([as, bs = [], cs], {
-  source,
-  position,
-  range,
-  linebreak
-}) => {
-  const str = linebreak === 0 ? source.slice(position - range + 1, position - 1) : '';
-  return linebreak === 0 && (str === '' || indexF.test(str)) ? new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
-    class: 'paren'
-  }, `（${str}）`))]) : new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
-    class: 'bracket'
-  }, (0, dom_1.defrag)((0, util_1.unwrap)(as.import(bs).import(cs)))))]);
-}, ([as, bs = new parser_1.List()], context) => {
-  const {
-    source,
-    position,
-    range,
-    linebreak
-  } = context;
-  const str = linebreak === 0 ? source.slice(position - range + 1, position) : '';
-  return linebreak === 0 && (str === '' || indexF.test(str)) ? new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
-    class: 'paren'
-  }, `（${str}`))]) : new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
-    class: 'bracket'
-  }, (0, dom_1.defrag)((0, util_1.unwrap)(as.import(bs)))))]);
-}));
+const p1 = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.precedence)(1, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, ')', [[')', 1]]))), (0, source_1.str)(')'), true, [], ([as, bs = new parser_1.List(), cs], context) => new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
+  class: bracketname(context, exports.indexA, 1, 1)
+}, (0, dom_1.defrag)((0, util_1.unwrap)(as.import(bs).import(cs)))))]), ([as, bs = new parser_1.List()], context) => new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
+  class: bracketname(context, exports.indexA, 1, 0)
+}, (0, dom_1.defrag)((0, util_1.unwrap)(as.import(bs)))))])));
+const p2 = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('（'), (0, combinator_1.precedence)(1, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, '）', [['）', 1]]))), (0, source_1.str)('）'), true, [], ([as, bs = new parser_1.List(), cs], context) => new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
+  class: bracketname(context, indexF, 1, 1)
+}, (0, dom_1.defrag)((0, util_1.unwrap)(as.import(bs).import(cs)))))]), ([as, bs = new parser_1.List()], context) => new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
+  class: bracketname(context, indexF, 1, 0)
+}, (0, dom_1.defrag)((0, util_1.unwrap)(as.import(bs)))))])));
 const s1 = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.precedence)(1, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, ']', [[']', 1]]))), (0, source_1.str)(']'), true, [2 | 4 /* Backtrack.common */], ([as, bs = new parser_1.List(), cs], context) => {
   const {
     source,
@@ -7069,18 +7041,20 @@ const combinator_1 = __webpack_require__(3484);
 const dom_1 = __webpack_require__(394);
 function indexee(parser) {
   return (0, combinator_1.fmap)(parser, (ns, {
-    id
+    id,
+    local
   }) => ns.length === 1 ? new parser_1.List([new parser_1.Node((0, dom_1.define)(ns.head.value, {
     id: identity('index', id, ns.head.value),
+    class: local ? `${ns.head.value.className} local`.trimStart() : undefined,
     'data-index': null
   }))]) : ns);
 }
 exports.indexee = indexee;
-const MAX = 60;
+const table = [...[...Array(36)].map((_, i) => i.toString(36)), ...[...Array(36)].map((_, i) => i.toString(36).toUpperCase()).slice(-26), '-', '='].join('');
+const MAX = 64 - '='.length - Math.ceil(Math.log(~0 >>> 0) / Math.log(table.length));
 const ELLIPSIS = '...';
 const PART = (MAX - ELLIPSIS.length) / 2 | 0;
 const REM = MAX - PART * 2 - ELLIPSIS.length;
-const table = [...[...Array(36)].map((_, i) => i.toString(36)), ...[...Array(36)].map((_, i) => i.toString(36).toUpperCase()).slice(-26), '-', '='].join('');
 function identity(type, id, text) {
   if (id === '') return undefined;
   if (typeof text !== 'string') {
@@ -7112,7 +7086,9 @@ function hash(source) {
   }
   return baseR(x >>> 0, 62);
 }
+
 // 62も64も最大6桁
+
 function baseR(n, r) {
   let acc = '';
   do {
@@ -8137,17 +8113,16 @@ const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
 const query_1 = __webpack_require__(2282);
 function* figure(target, notes, opts = {}) {
-  const refs = new queue_1.MultiQueue((0, array_1.push)((0, query_1.querySelectorAll)(target, 'a.label:not(.disabled)[data-label]'), notes && (0, query_1.querySelectorAll)(notes.references, 'a.label:not(.disabled)') || []).map(el => [el.getAttribute('data-label'), el]));
+  const selector = ':is(figure[data-label], h1, h2)';
+  const refs = new queue_1.MultiQueue((0, array_1.push)((0, query_1.querySelectorAll)(target, 'a.label:not(.local)[data-label]'), notes && (0, query_1.querySelectorAll)(notes.references, 'a.label:not(.local)') || []).map(el => [el.getAttribute('data-label'), el]));
   const labels = new Set();
   const numbers = new Map();
-  const scope = target instanceof Element ? ':scope > ' : '';
   let base = '0';
   let bases = base.split('.');
   let index = bases;
-  for (let defs = target.querySelectorAll(`${scope}:is(figure[data-label], h1, h2)`), len = defs.length, i = 0; i < len; ++i) {
+  for (let defs = target instanceof Element ? target.querySelectorAll(`:scope > ${selector}`) : target.querySelectorAll(`${selector}:not(* > *)`), len = defs.length, i = 0; i < len; ++i) {
     yield;
     const def = defs[i];
-    if (!scope && def.parentNode !== target) continue;
     const {
       tagName
     } = def;
@@ -8219,10 +8194,9 @@ function* figure(target, notes, opts = {}) {
         (0, util_1.unmarkInvalid)(ref);
       }
       if (ref.hash.slice(1) === def.id && ref.innerText === figindex) continue;
-      yield (0, dom_1.define)(ref, opts.id !== '' ? {
-        href: `#${def.id}`
-      } : {
-        class: `${ref.className} disabled`
+      yield (0, dom_1.define)(ref, {
+        class: opts.local ? `${ref.className} local` : undefined,
+        href: opts.id !== '' ? `#${def.id}` : undefined
       }, figindex);
     }
   }
@@ -8289,9 +8263,9 @@ function* note(target, notes, opts = {}, bottom = null) {
 exports.note = note;
 const annotationRefsMemoryCaller = (0, memoize_1.memoize)(target => new Map() ?? target, new WeakMap());
 const referenceRefsMemoryCaller = (0, memoize_1.memoize)(target => new Map() ?? target, new WeakMap());
-const annotation = build('annotation', 'annotations', '.annotation:not(:is(.annotations, .references) .annotation, .disabled)', n => `*${n}`, 'h1, h2, h3, h4, h5, h6, aside.aside, hr');
-const reference = build('reference', 'references', '.reference:not(:is(.annotations, .references) .reference, .disabled)', (n, abbr) => `[${abbr || n}]`);
-function build(syntax, list, query, marker, splitter = '') {
+const annotation = build('annotation', 'annotations', '.annotation:not(:is(.annotations, .references) &, .local)', n => `*${n}`, 'h1, h2, h3, h4, h5, h6, aside.aside, hr');
+const reference = build('reference', 'references', '.reference:not(:is(.annotations, .references) &, .local)', (n, abbr) => `[${abbr || n}]`);
+function build(syntax, list, selector, marker, splitter = '') {
   splitter &&= `${splitter}, .${list}`;
   return function* (memory, target, note, opts = {}, bottom = null) {
     const refInfoCaller = (0, memoize_1.memoize)(ref => {
@@ -8308,7 +8282,7 @@ function build(syntax, list, query, marker, splitter = '') {
       };
     }, memory);
     const defs = new Map();
-    const refs = target.querySelectorAll(query);
+    const refs = target.querySelectorAll(selector);
     const identifierInfoCaller = (0, memoize_1.memoize)(identifier => ({
       defIndex: 0,
       defSubindex: 0,
@@ -8316,8 +8290,7 @@ function build(syntax, list, query, marker, splitter = '') {
       title: '' && 0,
       queue: []
     }));
-    const scope = target instanceof Element ? ':scope > ' : '';
-    const splitters = splitter ? target.querySelectorAll(`${scope}:is(${splitter})`) : [];
+    const splitters = splitter ? target instanceof Element ? target.querySelectorAll(`:scope > :is(${splitter}, .${list})`) : target.querySelectorAll(`:is(${splitter}, .${list}):not(* > *)`) : [];
     let iSplitters = 0;
     let total = 0;
     let format;
@@ -8328,7 +8301,8 @@ function build(syntax, list, query, marker, splitter = '') {
         const pos = splitter?.compareDocumentPosition(ref) ?? 0;
         if (pos & (Node.DOCUMENT_POSITION_PRECEDING | Node.DOCUMENT_POSITION_DISCONNECTED)) break;
         if (~iSplitters << 32 - 8 === 0) yield;
-        if (splitter.classList.contains(list) && defs.size === 0) {
+        if (splitter.classList.contains(list) && splitter.nextElementSibling !== splitters[iSplitters + 1]) {
+          yield* proc(splitter);
           splitter.remove();
           continue;
         }
@@ -8337,7 +8311,7 @@ function build(syntax, list, query, marker, splitter = '') {
           const note = splitter.classList.contains(list) ? splitter : target.insertBefore((0, dom_1.html)('ol', {
             class: list
           }), splitter);
-          yield* proc(defs, note);
+          yield* proc(note, defs);
         }
       }
       const {
@@ -8364,7 +8338,7 @@ function build(syntax, list, query, marker, splitter = '') {
       const title = info.title ||= text;
       (0, dom_1.define)(ref, {
         id: refId,
-        class: opts.id !== '' ? undefined : void ref.classList.add('disabled'),
+        class: opts.local ? `${ref.className} local` : undefined,
         title
       }, []);
       if (title && info.queue.length > 0) {
@@ -8403,25 +8377,25 @@ function build(syntax, list, query, marker, splitter = '') {
     }
     if (note || defs.size > 0) {
       const splitter = splitters[iSplitters++];
-      yield* proc(defs, note ?? (splitter?.classList.contains(list) ? splitter : target.insertBefore((0, dom_1.html)('ol', {
+      note ??= splitter?.classList.contains(list) ? splitter : target.insertBefore((0, dom_1.html)('ol', {
         class: list
-      }), splitter ?? bottom)));
+      }), splitter ?? bottom);
+      yield* proc(note, defs);
     }
     if (splitter) for (let splitter; splitter = splitters[iSplitters]; ++iSplitters) {
       if (~iSplitters << 32 - 8 === 0) yield;
       if (splitter.classList.contains(list)) {
+        yield* proc(splitter);
         splitter.remove();
       }
     }
   };
 }
-function* proc(defs, note) {
-  const {
-    children
-  } = note;
+function* proc(note, defs) {
   for (let defs = note.children, i = defs.length; i--;) {
-    yield note.removeChild(children[i]);
+    yield note.removeChild(defs[i]);
   }
+  if (!defs) return;
   for (const [, def] of defs) {
     yield note.appendChild(def);
   }
@@ -9046,10 +9020,11 @@ exports.unescsource = unescsource;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.stringify = exports.unmarkInvalid = exports.markInvalid = exports.invalid = exports.repeat = exports.unwrap = void 0;
+exports.randomID = exports.stringify = exports.unmarkInvalid = exports.markInvalid = exports.invalid = exports.repeat = exports.unwrap = void 0;
 const parser_1 = __webpack_require__(605);
 const delimiter_1 = __webpack_require__(385);
 const alias_1 = __webpack_require__(5413);
+const random_1 = __webpack_require__(3158);
 const dom_1 = __webpack_require__(394);
 function* unwrap(nodes) {
   if (nodes === undefined) return;
@@ -9167,6 +9142,10 @@ function stringify(nodes) {
   return acc;
 }
 exports.stringify = stringify;
+function randomID() {
+  return `random-${(0, random_1.rnd0Z)(6)}`;
+}
+exports.randomID = randomID;
 
 /***/ },
 
@@ -9868,7 +9847,7 @@ Object.defineProperty(exports, "__esModule", ({
 exports.toc = void 0;
 const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
-const selector = ':is(h1, h2, h3, h4, h5, h6, aside.aside)[id]';
+const selector = ':is(h1, h2, h3, h4, h5, h6, aside.aside)[id]:not(.local)';
 function toc(source) {
   const hs = [];
   for (let es = source.querySelectorAll(selector), len = es.length, i = 0; i < len; ++i) {

package/markdown.d.ts

@@ -16,10 +16,12 @@ export namespace MarkdownParser {
     Markdown<'segment'>,
     Parser<string, Context, [
       SourceParser.EmptySegmentParser,
-      BlockParser.HeadingParser.SegmentParser,
-      BlockParser.CodeBlockParser.SegmentParser,
-      BlockParser.MathBlockParser.SegmentParser,
-      BlockParser.ExtensionParser.SegmentParser,
+      Parser<string, Context, [
+        BlockParser.HeadingParser.SegmentParser,
+        BlockParser.CodeBlockParser.SegmentParser,
+        BlockParser.MathBlockParser.SegmentParser,
+        BlockParser.ExtensionParser.SegmentParser,
+      ]>,
       SourceParser.ContentLineParser,
     ]> {
   }
@@ -48,20 +50,22 @@ export namespace MarkdownParser {
     Markdown<'block'>,
     Parser<HTMLElement, Context, [
       SourceParser.EmptySegmentParser,
-      BlockParser.PagebreakParser,
-      BlockParser.HeadingParser,
-      BlockParser.UListParser,
-      BlockParser.OListParser,
-      BlockParser.IListParser,
-      BlockParser.DListParser,
-      BlockParser.TableParser,
-      BlockParser.CodeBlockParser,
-      BlockParser.MathBlockParser,
-      BlockParser.ExtensionParser,
-      BlockParser.SidefenceParser,
-      BlockParser.BlockquoteParser,
-      BlockParser.MediaBlockParser,
-      BlockParser.ReplyParser,
+      Parser<HTMLElement, Context, [
+        BlockParser.PagebreakParser,
+        BlockParser.HeadingParser,
+        BlockParser.UListParser,
+        BlockParser.OListParser,
+        BlockParser.IListParser,
+        BlockParser.DListParser,
+        BlockParser.TableParser,
+        BlockParser.CodeBlockParser,
+        BlockParser.MathBlockParser,
+        BlockParser.ExtensionParser,
+        BlockParser.SidefenceParser,
+        BlockParser.BlockquoteParser,
+        BlockParser.MediaBlockParser,
+        BlockParser.ReplyParser,
+      ]>,
       BlockParser.ParagraphParser,
     ]> {
   }
@@ -614,25 +618,27 @@ export namespace MarkdownParser {
   export interface InlineParser extends
     Markdown<'inline'>,
     Parser<HTMLElement | string, Context, [
-      InlineParser.AnnotationParser,
-      InlineParser.ReferenceParser,
-      InlineParser.TemplateParser,
-      InlineParser.RemarkParser,
-      InlineParser.ExtensionParser,
-      InlineParser.LinkParser.TextLinkParser,
-      InlineParser.RubyParser,
-      InlineParser.HTMLParser,
-      InlineParser.InsertionParser,
-      InlineParser.DeletionParser,
-      InlineParser.MarkParser,
-      InlineParser.EmStrongParser,
-      InlineParser.StrongParser,
-      InlineParser.EmphasisParser,
-      InlineParser.ItalicParser,
-      InlineParser.MathParser,
-      InlineParser.CodeParser,
-      InlineParser.HTMLEntityParser,
-      InlineParser.BracketParser,
+      Parser<HTMLElement | string, Context, [
+        InlineParser.AnnotationParser,
+        InlineParser.ReferenceParser,
+        InlineParser.TemplateParser,
+        InlineParser.RemarkParser,
+        InlineParser.ExtensionParser,
+        InlineParser.LinkParser.TextLinkParser,
+        InlineParser.RubyParser,
+        InlineParser.HTMLParser,
+        InlineParser.InsertionParser,
+        InlineParser.DeletionParser,
+        InlineParser.MarkParser,
+        InlineParser.EmStrongParser,
+        InlineParser.StrongParser,
+        InlineParser.EmphasisParser,
+        InlineParser.ItalicParser,
+        InlineParser.MathParser,
+        InlineParser.CodeParser,
+        InlineParser.HTMLEntityParser,
+        InlineParser.BracketParser,
+      ]>,
       InlineParser.AutolinkParser,
       SourceParser.TextParser,
     ]> {
@@ -1056,12 +1062,6 @@ export namespace MarkdownParser {
       Inline<'bracket'>,
       Parser<HTMLElement | string, Context, [
         InlineParser,
-        InlineParser,
-        InlineParser,
-        InlineParser,
-        InlineParser,
-        InlineParser,
-        InlineParser,
       ]> {
     }
     export interface AutolinkParser extends

package/package.json

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

package/src/debug.test.ts

@@ -43,6 +43,6 @@ export function inspect(parser: Parser<DocumentFragment | HTMLElement | string>,
 // Bug: Firefox
 export function normalize(html: string): string {
   return html
-    .replace(/(data-number="[\w.]+") (hidden="")/g, '$2 $1')
-    .replace(/(data-type="[\w-]+") (type="\w+")/g, '$2 $1');
+    .replace(/:random-\w+:/g, ':random:')
+    .replace(/ data-invalid-\w+="[^"]*"/g, '');
 }

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

@@ -1,6 +1,7 @@
 import { parse } from './parse';
 import { Context } from '../context';
 import { html } from 'typed-dom/dom';
+import { normalize } from '../../debug.test';
 
 describe('Unit: parser/api/parse', () => {
   describe('parse', () => {
@@ -201,10 +202,10 @@ describe('Unit: parser/api/parse', () => {
             '~~~',
           ].join('\n'),
           '{#}',
-        ].join('\n\n'), { host: new URL(`${location.origin}/z`) }).children].map(el => el.outerHTML),
+        ].join('\n\n'), { host: new URL(`${location.origin}/z`) }).children].map(el => normalize(el.outerHTML)),
         [
           `<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="url" data-value="https://example/x"><span class="field-name">URL</span>: <span class="field-value">https://example/x</span>\n</span></details></aside>`,
-          '<pre class="invalid" translate="no" data-invalid-syntax="header" data-invalid-type="syntax" data-invalid-message="Invalid syntax">---\nURL: https://example/y\n---\n</pre>',
+          '<pre class="invalid" translate="no">---\nURL: https://example/y\n---\n</pre>',
           '<aside class="example" data-type="markdown"><pre translate="no">---\nURL: https://example/y\n---\n\n{#}</pre><hr><section><aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="url" data-value="https://example/y"><span class="field-name">URL</span>: <span class="field-value">https://example/y</span>\n</span></details></aside><p><a class="url" href="https://example/y#" target="_blank">#</a></p><h2>References</h2><ol class="references"></ol></section></aside>',
           '<p><a class="url" href="https://example/x#" target="_blank">#</a></p>',
         ]);

package/src/parser/api/parse.ts

@@ -11,6 +11,7 @@ import { ReadonlyURL } from 'spica/url';
 import { frag } from 'typed-dom/dom';
 
 interface Options extends ParserOptions {
+  readonly local?: boolean;
   readonly test?: boolean;
 }
 
@@ -21,6 +22,7 @@ export function parse(source: string, options: Options = {}, context?: Context):
     host: options.host ?? context?.host ?? new ReadonlyURL(location.pathname, location.origin),
     url: url ? new ReadonlyURL(url as ':') : context?.url,
     id: options.id ?? context?.id,
+    local: options.local ?? context?.local,
     caches: context?.caches,
     resources: context?.resources,
   });

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

@@ -78,7 +78,7 @@ describe('Unit: parser/block/blockquote', () => {
       assert.deepStrictEqual(inspect(parser, input('!>  a \n b  c ', new Context())), [['<blockquote><section><p> a<br> b c</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!>> a', new Context())), [['<blockquote><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!>> a\n> b', new Context())), [['<blockquote><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote><section><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('!> - a', new Context())), [['<blockquote><section><ul><li>a</li></ul><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('!> - a', new Context())), [['<blockquote><section><ul><li id="index:random:a" class="local">a</li></ul><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!> ```\na\n```', new Context())), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!> ```\n> a\n```', new Context())), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!> ```\n> a\n> ```', new Context())), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
@@ -91,10 +91,10 @@ describe('Unit: parser/block/blockquote', () => {
       assert.deepStrictEqual(inspect(parser, input('!>> > a\n> b', new Context())), [['<blockquote><blockquote><section><blockquote><pre>a</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote><section><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!> !> a', new Context())), [['<blockquote><section><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!> \na', new Context())), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('!>> ## a\n> ## a', new Context())), [['<blockquote><blockquote><section><h2>a</h2><h2>References</h2><ol class="references"></ol></section></blockquote><section><h2>a</h2><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('!>> ~ a\n> ~ a', new Context())), [['<blockquote><blockquote><section><dl><dt>a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote><section><dl><dt>a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('!>> ~~~figure $test-a\n>> > \n>>\n~~~\n> ~~~figure $test-a\n> > \n>\n[#a]\n~~~', new Context())), [['<blockquote><blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1"><figcaption><span class="figindex">Test 1. </span><span class="figtext"></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1"><figcaption><span class="figindex">Test 1. </span><span class="figtext"><a class="index">a</a></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('!>> ((a))\n> ((a))', new Context())), [['<blockquote><blockquote><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>a</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>a</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('!>> ## a\n> ## a', new Context())), [['<blockquote><blockquote><section><h2 id="index:random:a" class="local">a</h2><h2>References</h2><ol class="references"></ol></section></blockquote><section><h2 id="index:random:a" class="local">a</h2><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('!>> ~ a\n> ~ a', new Context())), [['<blockquote><blockquote><section><dl><dt id="index:random:a" class="local">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote><section><dl><dt id="index:random:a" class="local">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('!>> ~~~figure $test-a\n>> > \n>>\n~~~\n> ~~~figure $test-a\n> > \n>\n[#a]\n~~~', new Context())), [['<blockquote><blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1" id="label:random:test-a"><figcaption><span class="figindex">Test 1. </span><span class="figtext"></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1" id="label:random:test-a"><figcaption><span class="figindex">Test 1. </span><span class="figtext"><a class="index" href="#index:random:a">a</a></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('!>> ((a))\n> ((a))', new Context())), [['<blockquote><blockquote><section><p><sup class="annotation local" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote><section><p><sup class="annotation local" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
     });
 
   });

package/src/parser/block/blockquote.ts

@@ -4,7 +4,7 @@ import { List, Node } from '../../combinator/data/parser';
 import { union, some, consume, recursion, block, validate, rewrite, open, convert, lazy, fmap } from '../../combinator';
 import { autolink } from '../autolink';
 import { contentline } from '../source';
-import { unwrap } from '../util';
+import { unwrap, randomID } from '../util';
 import { parse } from '../api/parse';
 import { html, defrag } from 'typed-dom/dom';
 
@@ -44,7 +44,8 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
         const { source } = context;
         const references = html('ol', { class: 'references' });
         const document = parse(source, {
-          id: '',
+          local: true,
+          id: context.id === '' ? '' : randomID(),
           notes: {
             references,
           },