securemark 0.298.1 → 0.298.2

package/CHANGELOG.md

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

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.298.1 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"));
@@ -6312,7 +6312,6 @@ exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(1
   const {
     source,
     position,
-    range,
     linebreak,
     recursion,
     resources
@@ -6360,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);
@@ -6662,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);
@@ -6670,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,
@@ -6694,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,
@@ -8147,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 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;
@@ -8298,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, .local)', n => `*${n}`, 'h1, h2, h3, h4, h5, h6, aside.aside, hr');
-const reference = build('reference', 'references', '.reference:not(:is(.annotations, .references) .reference, .local)', (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 => {
@@ -8317,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,
@@ -8325,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;
@@ -8337,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;
         }
@@ -8346,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 {
@@ -8412,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);
   }

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.1",
+  "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/parser/block.ts

@@ -121,7 +121,7 @@ export const block: BlockParser = reset(
       }
     },
     paragraph
-  ]) as any));
+  ])));
 
 function error(parser: BlockParser): BlockParser {
   const reg = new RegExp(String.raw`^${Command.Error}[^\n]*\n`)

package/src/parser/inline/annotation.ts

@@ -3,7 +3,7 @@ import { State, Recursion } from '../context';
 import { List, Node } from '../../combinator/data/parser';
 import { union, some, recursions, precedence, constraint, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
-import { indexA } from './bracket';
+import { bracketname, indexA } from './bracket';
 import { beforeNonblank, trimBlankNodeEnd } from '../visibility';
 import { unwrap } from '../util';
 import { html, defrag } from 'typed-dom/dom';
@@ -34,14 +34,20 @@ export const annotation: AnnotationParser = lazy(() => constraint(State.annotati
     if (linebreak !== 0) {
       ns.unshift(new Node('('));
       ns.push(new Node(')'));
-      return new List([new Node(html('span', { class: 'bracket' }, ['(', html('span', { class: 'bracket' }, defrag(unwrap(ns))), ')']))]);
+      return new List([
+        new Node(html('span',
+          { class: 'bracket' },
+          ['(', html('span', { class: 'bracket' }, defrag(unwrap(ns))), ')']))
+      ]);
     }
     const depth = MAX_DEPTH - (resources?.recursions[Recursion.annotation] ?? resources?.recursions.at(-1) ?? MAX_DEPTH);
     recursion.add(depth);
-    return new List([new Node(html('sup', { class: 'annotation' }, [html('span', defrag(unwrap(trimBlankNodeEnd(ns))))]))]);
+    return new List([
+      new Node(html('sup', { class: 'annotation' }, [html('span', defrag(unwrap(trimBlankNodeEnd(ns))))]))
+    ]);
   },
   ([, bs], context) => {
-    const { source, position, range, linebreak, recursion, resources } = context;
+    const { source, position, linebreak, recursion, resources } = context;
     const depth = MAX_DEPTH - (resources?.recursions[Recursion.annotation] ?? resources?.recursions.at(-1) ?? MAX_DEPTH);
     if (linebreak === 0 && bs && bs.length === 1 && source[position] === ')' && typeof bs.head?.value === 'object') {
       const { className } = bs.head.value;
@@ -63,12 +69,20 @@ export const annotation: AnnotationParser = lazy(() => constraint(State.annotati
         }
         context.position += 1;
         recursion.add(depth);
-        return new List([new Node(html('span', { class: 'bracket' }, ['(', html('sup', { class: 'annotation' }, [html('span', bs.head.value.childNodes)])]))]);
+        return new List([
+          new Node(html('span',
+            { class: 'bracket' },
+            ['(', html('sup', { class: 'annotation' }, [html('span', bs.head.value.childNodes)])]))
+        ]);
       }
       if (className === 'annotation' && deepunwrap(bs)) {
         context.position += 1;
         recursion.add(depth);
-        return new List([new Node(html('span', { class: 'bracket' }, ['(', html('sup', { class: 'annotation' }, [html('span', [bs.head.value])])]))]);
+        return new List([
+          new Node(html('span',
+            { class: 'bracket' },
+            ['(', html('sup', { class: 'annotation' }, [html('span', [bs.head.value])])]))
+        ]);
       }
     }
     bs ??= new List();
@@ -76,11 +90,13 @@ export const annotation: AnnotationParser = lazy(() => constraint(State.annotati
     if (source[context.position] === ')') {
       bs.push(new Node(')'));
       context.position += 1;
+      context.range += 1;
     }
-    const str = linebreak === 0 ? source.slice(position - range + 2, position) : '';
-    bs = linebreak === 0 && (str === '' || indexA.test(str))
-      ? new List([new Node(html('span', { class: 'paren' }, defrag(unwrap(bs))))])
-      : new List([new Node(html('span', { class: 'bracket' }, defrag(unwrap(bs))))]);
+    bs = new List([
+      new Node(html('span',
+        { class: bracketname(context, indexA, 2, context.position - position) },
+        defrag(unwrap(bs))))
+    ]);
     bs.unshift(new Node('('));
     const cs = parser(context);
     if (source[context.position] === ')') {

package/src/parser/inline/bracket.test.ts

@@ -20,9 +20,10 @@ describe('Unit: parser/inline/bracket', () => {
       assert.deepStrictEqual(inspect(parser, input('(0)-1', new Context())), [['<span class="paren">(0)</span>'], '-1']);
       assert.deepStrictEqual(inspect(parser, input('(0.1)', new Context())), [['<span class="paren">(0.1)</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('(0.1.2)', new Context())), [['<span class="paren">(0.1.2)</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1.1, 1.2-1.3, 1.4)', new Context())), [['<span class="paren">(1.1, 1.2-1.3, 1.4)</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1 2)', new Context())), [['<span class="bracket">(1 2)</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('(1, 2)', new Context())), [['<span class="paren">(1, 2)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1.1-1.2)', new Context())), [['<span class="paren">(1.1-1.2)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1.1, 1.2)', new Context())), [['<span class="paren">(1.1, 1.2)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1 2)', new Context())), [['<span class="bracket">(1 2)</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('(1a)', new Context())), [['<span class="paren">(1a)</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('(a)', new Context())), [['<span class="paren">(a)</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('(a1)', new Context())), [['<span class="paren">(a1)</span>'], '']);
@@ -39,6 +40,8 @@ describe('Unit: parser/inline/bracket', () => {
       assert.deepStrictEqual(inspect(parser, input('(Name, Name)', new Context())), [['<span class="paren">(Name, Name)</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('(ABBR)', new Context())), [['<span class="paren">(ABBR)</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('(ABBR, ABBR)', new Context())), [['<span class="paren">(ABBR, ABBR)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input(`(${'0'.repeat(16)})`, new Context())), [[`<span class="paren">(${'0'.repeat(16)})</span>`], '']);
+      assert.deepStrictEqual(inspect(parser, input(`(${'0'.repeat(17)})`, new Context())), [[`<span class="bracket">(${'0'.repeat(17)})</span>`], '']);
       assert.deepStrictEqual(inspect(parser, input('(\\a)', new Context())), [['<span class="bracket">(a)</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('(==)', new Context())), [['<span class="bracket">(==)</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('(()', new Context())), [['<span class="bracket">(<span class="paren">()</span></span>'], '']);

package/src/parser/inline/bracket.ts

@@ -1,5 +1,5 @@
 import { BracketParser } from '../inline';
-import { State, Recursion, Backtrack } from '../context';
+import { Context, State, Recursion, Backtrack } from '../context';
 import { List, Node } from '../../combinator/data/parser';
 import { union, some, recursion, precedence, surround, isBacktrack, setBacktrack, lazy } from '../../combinator';
 import { inline } from '../inline';
@@ -8,9 +8,22 @@ import { str } from '../source';
 import { unwrap } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
-export const indexA = /^[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*$/;
-const indexF = new RegExp(indexA.source.replace(', ', '[，、]')
-  .replace(/[09AZaz.]|\-(?!\w)/g, c => String.fromCodePoint(c.codePointAt(0)! + 0xFEE0)));
+export const indexA = /[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*/y;
+const indexF = new RegExp(
+  indexA.source.replace(', ', '[，、]')
+    .replace(/[09AZaz.]|\-(?!\w)/g, c => String.fromCodePoint(c.codePointAt(0)! + 0xFEE0)),
+  'y');
+export function bracketname(context: Context, syntax: RegExp, opener: number, closer: number): string {
+  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';
+}
 
 export const bracket: BracketParser = lazy(() => union([
   input => {
@@ -32,45 +45,39 @@ export const bracket: BracketParser = lazy(() => union([
         return d1(input);
     }
   }
-])) as any;
+]));
 
 const p1 = lazy(() => surround(
   str('('),
   precedence(1, recursion(Recursion.bracket, some(inline, ')', [[')', 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 === '' || indexA.test(str))
-      ? new List([new Node(html('span', { class: 'paren' }, `(${str})`))])
-      : new List([new Node(html('span', { class: 'bracket' }, defrag(unwrap(as.import(bs as List<Node<string>>).import(cs)))))]);
-  },
-  ([as, bs = new List()], context) => {
-    const { source, position, range, linebreak } = context;
-    const str = linebreak === 0 ? source.slice(position - range + 1, position) : '';
-    return linebreak === 0 && (str === '' || indexA.test(str))
-      ? new List([new Node(html('span', { class: 'paren' }, `(${str}`))])
-      : new List([new Node(html('span', { class: 'bracket' }, defrag(unwrap(as.import(bs as List<Node<string>>)))))]);
-  }));
+  ([as, bs = new List(), cs], context) => new List([
+    new Node(html('span',
+      { class: bracketname(context, indexA, 1, 1) },
+      defrag(unwrap(as.import(bs as List<Node<string>>).import(cs)))))
+  ]),
+  ([as, bs = new List()], context) => new List([
+    new Node(html('span',
+      { class: bracketname(context, indexA, 1, 0) },
+      defrag(unwrap(as.import(bs as List<Node<string>>)))))
+  ])));
 
 const p2 = lazy(() => surround(
   str('（'),
   precedence(1, recursion(Recursion.bracket, some(inline, '）', [['）', 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 List([new Node(html('span', { class: 'paren' }, `（${str}）`))])
-      : new List([new Node(html('span', { class: 'bracket' }, defrag(unwrap(as.import(bs as List<Node<string>>).import(cs)))))]);
-  },
-  ([as, bs = new 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 List([new Node(html('span', { class: 'paren' }, `（${str}`))])
-      : new List([new Node(html('span', { class: 'bracket' }, defrag(unwrap(as.import(bs as List<Node<string>>)))))]);
-  }));
+  ([as, bs = new List(), cs], context) => new List([
+    new Node(html('span',
+      { class: bracketname(context, indexF, 1, 1) },
+      defrag(unwrap(as.import(bs as List<Node<string>>).import(cs)))))
+  ]),
+  ([as, bs = new List()], context) => new List([
+    new Node(html('span',
+      { class: bracketname(context, indexF, 1, 0) },
+      defrag(unwrap(as.import(bs as List<Node<string>>)))))
+  ])));
 
 const s1 = lazy(() => surround(
   str('['),

package/src/parser/inline.ts

@@ -123,7 +123,7 @@ export const inline: InlineParser = lazy(() => union([
   },
   autolink,
   text
-])) as any;
+]));
 
 export { indexee } from './inline/extension/indexee';
 export { indexer } from './inline/extension/indexer';

package/src/parser/processor/figure.ts

@@ -13,22 +13,24 @@ export function* figure(
     readonly local?: boolean;
   } = {},
 ): Generator<HTMLAnchorElement | undefined, undefined, undefined> {
+  const selector = ':is(figure[data-label], h1, h2)';
   const refs = new MultiQueue<string, HTMLAnchorElement>(push(
     querySelectorAll(target, 'a.label:not(.local)[data-label]'),
     notes && querySelectorAll(notes.references, 'a.label:not(.local)') || [])
     .map(el => [el.getAttribute('data-label')!, el]));
   const labels = new Set<string>();
   const numbers = new Map<string, string>();
-  const scope = target instanceof Element ? ':scope > ' : '';
   let base = '0';
   let bases: readonly string[] = base.split('.');
   let index: readonly string[] = bases;
   for (
-    let defs = target.querySelectorAll(`${scope}:is(figure[data-label], h1, h2)`),
+    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;
+    assert(def.parentNode === target || !def.parentNode);
     const { tagName } = def;
     if (bases.length === 1 && tagName[0] === 'H') continue;
     assert(base === '0' || bases.length > 1);

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

@@ -116,11 +116,11 @@ describe('Unit: parser/processor/note', () => {
     });
 
     it('separation', () => {
-      const target = html('blockquote', parse([
+      const target = parse([
         '!>> ((1))\n> ((2))\n~~~',
         '~~~~example/markdown\n((3))\n~~~~',
         '((4))',
-      ].join('\n\n')).children);
+      ].join('\n\n'));
       for (let i = 0; i < 3; ++i) {
         [...note(target)];
         assert.deepStrictEqual(

package/src/parser/processor/note.ts

@@ -50,19 +50,19 @@ const referenceRefsMemoryCaller = memoize((target: Node) =>
 const annotation = build(
   'annotation',
   'annotations',
-  '.annotation:not(:is(.annotations, .references) .annotation, .local)',
+  '.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) .reference, .local)',
+  '.reference:not(:is(.annotations, .references) &, .local)',
   (n, abbr) => `[${abbr || n}]`);
 
 function build(
   syntax: string,
   list: string,
-  query: string,
+  selector: string,
   marker: (index: number, abbr: string) => string,
   splitter: string = '',
 ) {
@@ -101,7 +101,7 @@ function build(
       };
     }, memory);
     const defs = new Map<string, HTMLLIElement>();
-    const refs = target.querySelectorAll<HTMLElement>(query);
+    const refs = target.querySelectorAll<HTMLElement>(selector);
     const identifierInfoCaller = memoize((identifier: string) => ({
       defIndex: 0,
       defSubindex: 0,
@@ -109,8 +109,11 @@ function build(
       title: '' && identifier,
       queue: [] as HTMLElement[],
     }));
-    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: 'number' | 'abbr';
@@ -118,11 +121,12 @@ function build(
     for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
       if (splitter) for (let splitter; splitter = splitters[iSplitters]; ++iSplitters) {
+        assert(splitter.parentNode === target || !splitter.parentNode);
         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) {
-          assert(splitter.matches(`.${list}`));
+        if (splitter.classList.contains(list) && splitter.nextElementSibling !== splitters[iSplitters + 1]) {
+          yield* proc(splitter as HTMLOListElement);
           splitter.remove();
           continue;
         }
@@ -133,7 +137,7 @@ function build(
             ? splitter as HTMLOListElement
             : target.insertBefore(html('ol', { class: list }), splitter);
           assert(note.parentNode);
-          yield* proc(defs, note);
+          yield* proc(note, defs);
           assert(defs.size === 0);
         }
       }
@@ -209,25 +213,27 @@ function build(
     }
     if (note || defs.size > 0) {
       const splitter = splitters[iSplitters++];
-      yield* proc(defs, note ?? (splitter?.classList.contains(list)
+      note ??= splitter?.classList.contains(list)
         ? splitter as HTMLOListElement
-        : target.insertBefore(html('ol', { class: list }), splitter ?? bottom)));
+        : target.insertBefore(html('ol', { class: list }), splitter ?? bottom);
+      yield* proc(note, defs);
       assert(defs.size === 0);
     }
     if (splitter) for (let splitter; splitter = splitters[iSplitters]; ++iSplitters) {
       if (~iSplitters << 32 - 8 === 0) yield;
       if (splitter.classList.contains(list)) {
+        yield* proc(splitter as HTMLOListElement);
         splitter.remove();
       }
     }
   }
 }
 
-function* proc(defs: Map<string, HTMLLIElement>, note: HTMLOListElement): Generator<HTMLLIElement | undefined, undefined, undefined> {
-  const { children } = note;
+function* proc(note: HTMLOListElement, defs?: Map<string, HTMLLIElement>): Generator<HTMLLIElement | undefined, undefined, undefined> {
   for (let defs = note.children, i = defs.length; i--;) {
-    yield note.removeChild(children[i] as HTMLLIElement);
+    yield note.removeChild(defs[i] as HTMLLIElement);
   }
+  if (!defs) return;
   for (const [, def] of defs) {
     yield note.appendChild(def);
   }

package/src/parser/segment.ts

@@ -35,7 +35,7 @@ const parser: SegmentParser = union([
     }
   },
   some(contentline, MAX_SEGMENT_SIZE + 1),
-]) as any;
+]);
 
 export function* segment(source: string): Generator<readonly [string, Segment], undefined, undefined> {
   if (!validate(source, MAX_INPUT_SIZE)) return yield [`${Command.Error}Too large input over ${MAX_INPUT_SIZE.toLocaleString('en')} bytes.\n${source.slice(0, 1001)}`, Segment.unknown];