securemark 0.276.3 → 0.276.5

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.276.5
+
+- Refactoring.
+
+## 0.276.4
+
+- Refactoring.
+
 ## 0.276.3
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.276.3 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.276.5 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"));
@@ -580,7 +580,7 @@ class Cache {
             LFU.unshift(this.overlap(entry));
             entry.partition = 'LFU';
             this.injection = 0;
-            this.declination = this.overlapLRU * 100 < LFU.length * this.sample ? 1 : (0, alias_1.min)(this.declination * 1.5, 10);
+            this.declination = this.overlapLRU * 100 < LFU.length * this.sample ? 1 : (0, alias_1.min)(this.declination * 1.5, 5);
           }
         }
         if (this.sweeper.isActive()) {
@@ -634,7 +634,7 @@ class Cache {
         if (entry === LRU.head) return;
         entry.affiliation = 'LFU';
       } else {
-        const delta = LRU.length > LFU.length && LRU.length >= this.capacity - this.partition ? LRU.length / (LFU.length || 1) * (0, alias_1.max)(this.overlapLRU / this.overlapLFU, 1) | 0 || 1 : 1;
+        const delta = LRU.length >= this.capacity - this.partition ? (0, alias_1.max)(LRU.length / (LFU.length || 1) * (0, alias_1.max)(this.overlapLRU / this.overlapLFU, 1) | 0, 1) : 0;
         this.partition = (0, alias_1.min)(this.partition + delta, this.capacity - this.window);
         --this.overlapLFU;
       }
@@ -643,7 +643,7 @@ class Cache {
       entry.partition = 'LFU';
     } else {
       if (entry.affiliation === 'LFU') {} else {
-        const delta = LFU.length > LRU.length && LFU.length >= this.partition ? LFU.length / (LRU.length || 1) * (0, alias_1.max)(this.overlapLFU / this.overlapLRU, 1) | 0 || 1 : 1;
+        const delta = LFU.length >= this.partition ? (0, alias_1.max)(LFU.length / (LRU.length || 1) * (0, alias_1.max)(this.overlapLFU / this.overlapLRU, 1) | 0, 1) : 0;
         this.partition = (0, alias_1.max)(this.partition - delta, 0);
         entry.affiliation = 'LFU';
         --this.overlapLRU;
@@ -1522,9 +1522,9 @@ class Heap {
     this.$length = 0;
   }
 }
+exports.Heap = Heap;
 Heap.max = (a, b) => a > b ? -1 : a < b ? 1 : 0;
 Heap.min = (a, b) => a > b ? 1 : a < b ? -1 : 0;
-exports.Heap = Heap;
 function sort(cmp, array, index, length, stable) {
   if (length === 0) return false;
   switch (index) {
@@ -1666,9 +1666,9 @@ class MultiHeap {
     this.$length = 0;
   }
 }
+exports.MultiHeap = MultiHeap;
 MultiHeap.max = Heap.max;
 MultiHeap.min = Heap.min;
-exports.MultiHeap = MultiHeap;
 
 /***/ }),
 
@@ -1815,7 +1815,7 @@ exports.List = List;
     }
   }
   List.Node = Node;
-})(List = exports.List || (exports.List = {}));
+})(List || (exports.List = List = {}));
 
 /***/ }),
 
@@ -2028,10 +2028,10 @@ class PriorityQueue {
     return;
   }
 }
+exports.PriorityQueue = PriorityQueue;
 PriorityQueue.priority = Symbol('priority');
 PriorityQueue.max = heap_1.Heap.max;
 PriorityQueue.min = heap_1.Heap.min;
-exports.PriorityQueue = PriorityQueue;
 class MultiQueue {
   constructor(entries) {
     this.dict = new Map();
@@ -2219,7 +2219,7 @@ function xorshift(seed = xorshift.seed()) {
     let x = seed;
     x ^= x << 13;
     x ^= x >> 17;
-    x ^= x << 5;
+    x ^= x << 15;
     return seed = x >>> 0;
   };
 }
@@ -2235,7 +2235,7 @@ exports.xorshift = xorshift;
     return () => rng() / (max + 1);
   }
   xorshift.random = random;
-})(xorshift = exports.xorshift || (exports.xorshift = {}));
+})(xorshift || (exports.xorshift = xorshift = {}));
 const uint32n = n => n & 2n ** 32n - 1n;
 const uint64n = n => n & 2n ** 64n - 1n;
 // https://www.pcg-random.org/download.html
@@ -2286,7 +2286,7 @@ exports.pcg32 = pcg32;
     return seed;
   }
   pcg32.advance = advance;
-})(pcg32 = exports.pcg32 || (exports.pcg32 = {}));
+})(pcg32 || (exports.pcg32 = pcg32 = {}));
 
 /***/ }),
 
@@ -2605,6 +2605,7 @@ class ReadonlyURL {
     return this.href;
   }
 }
+exports.ReadonlyURL = ReadonlyURL;
 // Can't freeze URL object in the Firefox extension environment.
 // ref: https://github.com/falsandtru/pjax-api/issues/44#issuecomment-633915035
 // Bug: Error in dependents.
@@ -2612,7 +2613,6 @@ class ReadonlyURL {
 ReadonlyURL.get = (0, memoize_1.memoize)((url, base) => ({
   url: new __webpack_require__.g.URL(url, base)
 }), (url, base = '') => `${base.indexOf('\n') > -1 ? base.replace(/\n+/g, '') : base}\n${url}`, new cache_1.Cache(10000));
-exports.ReadonlyURL = ReadonlyURL;
 
 /***/ }),
 
@@ -3575,6 +3575,7 @@ class Delimiters {
     return false;
   }
 }
+exports.Delimiters = Delimiters;
 _a = Delimiters;
 Delimiters.matcher = (0, memoize_1.memoize)(pattern => {
   switch (typeof pattern) {
@@ -3586,7 +3587,6 @@ Delimiters.matcher = (0, memoize_1.memoize)(pattern => {
       return (0, memoize_1.reduce)(source => pattern.test(source) || undefined);
   }
 }, _a.signature);
-exports.Delimiters = Delimiters;
 
 /***/ }),
 
@@ -4135,8 +4135,8 @@ exports.caches = void 0;
 const cache_1 = __webpack_require__(9210);
 // For rerendering in editing.
 exports.caches = {
-  code: new cache_1.Cache(100),
-  math: new cache_1.Cache(100),
+  code: new cache_1.Cache(1000),
+  math: new cache_1.Cache(10000),
   media: new cache_1.Cache(100)
 };
 
@@ -7133,10 +7133,6 @@ const util_1 = __webpack_require__(9437);
 const memoize_1 = __webpack_require__(1808);
 const dom_1 = __webpack_require__(3252);
 function* note(target, notes, opts = {}, bottom = null) {
-  for (let es = target.querySelectorAll(`.annotations`), len = es.length, i = 0; i < len; ++i) {
-    const el = es[i];
-    el.parentNode === target && el.remove();
-  }
   yield* (0, exports.annotation)(target, notes?.annotations, opts, bottom);
   yield* (0, exports.reference)(target, notes?.references, opts, bottom);
   return;
@@ -7145,6 +7141,7 @@ exports.note = note;
 exports.annotation = build('annotation', n => `*${n}`, 'h1, h2, h3, h4, h5, h6, aside.aside, hr');
 exports.reference = build('reference', (n, abbr) => `[${abbr || n}]`);
 function build(syntax, marker, splitter = '') {
+  splitter &&= `${splitter}, .${syntax}s`;
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
   // 構文ごとに各1回の処理では不可能
   const memory = (0, memoize_1.memoize)(ref => {
@@ -7165,8 +7162,8 @@ function build(syntax, marker, splitter = '') {
     const titles = new Map();
     const defIndexes = new Map();
     const refSubindexes = new Map();
-    const defSubindexes = splitter && refs.length > 0 ? new Map() : undefined;
-    const splitters = splitter && refs.length > 0 ? target.querySelectorAll(splitter) : [];
+    const defSubindexes = new Map();
+    const splitters = splitter ? target.querySelectorAll(splitter) : [];
     let iSplitters = 0;
     let total = 0;
     let format;
@@ -7177,15 +7174,19 @@ function build(syntax, marker, splitter = '') {
         yield;
         continue;
       }
-      if (splitter) for (let el; (el = splitters[iSplitters])?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING; ++iSplitters) {
+      if (splitter) for (let el; el = splitters[iSplitters], el?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING; ++iSplitters) {
+        if (~iSplitters << 32 - 8 === 0) yield;
         if (el.parentNode !== target) continue;
+        if (el.tagName === 'OL' && el.nextElementSibling !== splitters[iSplitters + 1]) {
+          el.remove();
+          continue;
+        }
         if (defs.size > 0) {
           total += defs.size;
-          yield* proc(defs, target.insertBefore((0, dom_1.html)('ol', {
+          const note = el.tagName === 'OL' ? el : target.insertBefore((0, dom_1.html)('ol', {
             class: `${syntax}s`
-          }), el));
-        } else if (~iSplitters % 128 === 0) {
-          yield;
+          }), el);
+          yield* proc(defs, note);
         }
       }
       const {
@@ -7239,9 +7240,18 @@ function build(syntax, marker, splitter = '') {
       }, `^${++refIndex}`));
     }
     if (note || defs.size > 0) {
-      yield* proc(defs, note ?? target.insertBefore((0, dom_1.html)('ol', {
+      const el = splitters[iSplitters];
+      note ??= el?.tagName === 'OL' && el.nextElementSibling == splitters[iSplitters + 1] ? (++iSplitters, el) : target.insertBefore((0, dom_1.html)('ol', {
         class: `${syntax}s`
-      }), splitters[iSplitters] ?? bottom));
+      }), splitters[iSplitters] ?? bottom);
+      yield* proc(defs, note);
+    }
+    if (splitter) for (let el; el = splitters[iSplitters]; ++iSplitters) {
+      if (~iSplitters << 32 - 8 === 0) yield;
+      if (el.parentNode !== target) continue;
+      if (el.tagName === 'OL') {
+        el.remove();
+      }
     }
     return;
   };
@@ -7690,7 +7700,7 @@ var blank;
 (function (blank) {
   blank.line = new RegExp(/^(?:\\?[^\S\n]|&IHN;|<wbr[^\S\n]*>|\\$)+$/.source.replace('IHN', `(?:${normalize_1.invisibleHTMLEntityNames.join('|')})`), 'gm');
   blank.start = new RegExp(/^(?:\\?[^\S\n]|&IHN;|<wbr[^\S\n]*>)+/.source.replace('IHN', `(?:${normalize_1.invisibleHTMLEntityNames.join('|')})`));
-})(blank = exports.blank || (exports.blank = {}));
+})(blank || (exports.blank = blank = {}));
 function visualize(parser) {
   return (0, combinator_1.union)([(0, combinator_1.convert)(source => source.replace(blank.line, line => line.replace(/[\\&<]/g, '\x1B$&')), (0, combinator_1.verify)(parser, (ns, rest, context) => !rest && hasVisible(ns, context))), (0, combinator_1.some)((0, combinator_1.union)([source_1.linebreak, source_1.unescsource]))]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.276.3",
+  "version": "0.276.5",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -34,11 +34,11 @@
     "@types/mocha": "10.0.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.59.7",
+    "@typescript-eslint/parser": "^5.59.8",
     "babel-loader": "^9.1.2",
     "babel-plugin-unassert": "^3.2.0",
-    "concurrently": "^8.0.1",
-    "eslint": "^8.41.0",
+    "concurrently": "^8.1.0",
+    "eslint": "^8.42.0",
     "eslint-plugin-redos": "^4.4.5",
     "eslint-webpack-plugin": "^4.0.1",
     "glob": "^10.2.6",
@@ -51,12 +51,12 @@
     "mocha": "^10.2.0",
     "npm-check-updates": "^16.10.12",
     "semver": "^7.5.1",
-    "spica": "0.0.728",
+    "spica": "0.0.731",
     "ts-loader": "^9.4.3",
     "typed-dom": "0.0.335",
-    "typescript": "5.0.4",
-    "webpack": "^5.84.1",
-    "webpack-cli": "^5.1.1",
+    "typescript": "5.1.3",
+    "webpack": "^5.85.0",
+    "webpack-cli": "^5.1.3",
     "webpack-merge": "^5.9.0"
   },
   "scripts": {

package/src/parser/api/cache.ts

@@ -4,7 +4,7 @@ import { Cache } from 'spica/cache';
 // For rerendering in editing.
 
 export const caches: Caches = {
-  code: new Cache<string, HTMLElement>(100),
-  math: new Cache<string, HTMLElement>(100),
+  code: new Cache<string, HTMLElement>(1000),
+  math: new Cache<string, HTMLElement>(10000),
   media: new Cache<string, HTMLElement>(100),
 } as const;

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

@@ -8,21 +8,16 @@ describe('Unit: parser/processor/note', () => {
   describe('annotation', () => {
     it('empty', () => {
       const target = parse('');
-      const note = html('ol');
-      [...annotation(target, note)];
+      [...annotation(target)];
       assert.deepStrictEqual(
         [...target.children].map(el => el.outerHTML),
         []);
-      assert.deepStrictEqual(
-        note.outerHTML,
-        html('ol').outerHTML);
     });
 
     it('1', () => {
       const target = parse('((a b))');
-      const note = html('ol');
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target, note)].length, i === 0 ? 2 : 1);
+        assert.deepStrictEqual([...annotation(target)].length, i === 0 ? 2 : 1);
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -32,23 +27,20 @@ describe('Unit: parser/processor/note', () => {
                 html('a', { href: '#annotation::def:a_b:1' }, '*1')
               ]),
             ]).outerHTML,
+            html('ol', { class: 'annotations' }, [
+              html('li', { id: 'annotation::def:a_b:1', 'data-marker': '*1' }, [
+                html('span', 'a b'),
+                html('sup', [html('a', { href: '#annotation::ref:a_b:1' }, '^1')]),
+              ]),
+            ]).outerHTML,
           ]);
-        assert.deepStrictEqual(
-          note.outerHTML,
-          html('ol', [
-            html('li', { id: 'annotation::def:a_b:1' }, [
-              html('span', 'a b'),
-              html('sup', [html('a', { href: '#annotation::ref:a_b:1' }, '^1')]),
-            ]),
-          ]).outerHTML);
       }
     });
 
     it('2', () => {
       const target = parse('((1))((12345678901234567890))');
-      const note = html('ol');
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target, note)].length, i === 0 ? 4 : 2);
+        assert.deepStrictEqual([...annotation(target)].length, i === 0 ? 4 : 2);
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -62,27 +54,24 @@ describe('Unit: parser/processor/note', () => {
                 html('a', { href: '#annotation::def:12345678901234567890:1' }, '*2')
               ]),
             ]).outerHTML,
+            html('ol', { class: 'annotations' }, [
+              html('li', { id: 'annotation::def:1:1', 'data-marker': '*1' }, [
+                html('span', '1'),
+                html('sup', [html('a', { href: '#annotation::ref:1:1' }, '^1')]),
+              ]),
+              html('li', { id: 'annotation::def:12345678901234567890:1', 'data-marker': '*2' }, [
+                html('span', '12345678901234567890'),
+                html('sup', [html('a', { href: '#annotation::ref:12345678901234567890:1' }, '^2')]),
+              ]),
+            ]).outerHTML,
           ]);
-        assert.deepStrictEqual(
-          note.outerHTML,
-          html('ol', [
-            html('li', { id: 'annotation::def:1:1' }, [
-              html('span', '1'),
-              html('sup', [html('a', { href: '#annotation::ref:1:1' }, '^1')]),
-            ]),
-            html('li', { id: 'annotation::def:12345678901234567890:1' }, [
-              html('span', '12345678901234567890'),
-              html('sup', [html('a', { href: '#annotation::ref:12345678901234567890:1' }, '^2')]),
-            ]),
-          ]).outerHTML);
       }
     });
 
     it('unify', () => {
       const target = parse('((1))((2))((3))((2))((4))');
-      const note = html('ol');
       for (let i = 0; i < 3; ++i) {
-        [...annotation(target, note)];
+        [...annotation(target)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -108,35 +97,29 @@ describe('Unit: parser/processor/note', () => {
                 html('a', { href: '#annotation::def:4:1' }, '*4')
               ]),
             ]).outerHTML,
-          ]);
-        assert.deepStrictEqual(
-          note.outerHTML,
-          html('ol', [
-            html('li', { id: 'annotation::def:1:1' }, [
-              html('span', '1'),
-              html('sup', [html('a', { href: '#annotation::ref:1:1' }, '^1')]),
-            ]),
-            html('li', { id: 'annotation::def:2:1' }, [
-              html('span', '2'),
-              html('sup', [
-                html('a', { href: '#annotation::ref:2:1' }, '^2'),
-                html('a', { href: '#annotation::ref:2:2' }, '^4'),
+            html('ol', { class: 'annotations' }, [
+              html('li', { id: 'annotation::def:1:1', 'data-marker': '*1' }, [
+                html('span', '1'),
+                html('sup', [html('a', { href: '#annotation::ref:1:1' }, '^1')]),
               ]),
-            ]),
-            html('li', { id: 'annotation::def:3:1' }, [
-              html('span', '3'),
-              html('sup', [html('a', { href: '#annotation::ref:3:1' }, '^3')]),
-            ]),
-            html('li', { id: 'annotation::def:4:1' }, [
-              html('span', '4'),
-              html('sup', [html('a', { href: '#annotation::ref:4:1' }, '^5')]),
-            ]),
-          ]).outerHTML);
+              html('li', { id: 'annotation::def:2:1', 'data-marker': '*2' }, [
+                html('span', '2'),
+                html('sup', [
+                  html('a', { href: '#annotation::ref:2:1' }, '^2'),
+                  html('a', { href: '#annotation::ref:2:2' }, '^4'),
+                ]),
+              ]),
+              html('li', { id: 'annotation::def:3:1', 'data-marker': '*3' }, [
+                html('span', '3'),
+                html('sup', [html('a', { href: '#annotation::ref:3:1' }, '^3')]),
+              ]),
+              html('li', { id: 'annotation::def:4:1', 'data-marker': '*4' }, [
+                html('span', '4'),
+                html('sup', [html('a', { href: '#annotation::ref:4:1' }, '^5')]),
+              ]),
+            ]).outerHTML,
+          ]);
       }
-      [...annotation(parse(''), note)];
-      assert.deepStrictEqual(
-        note.outerHTML,
-        html('ol').outerHTML);
     });
 
     it('separation', () => {
@@ -145,19 +128,16 @@ describe('Unit: parser/processor/note', () => {
         '~~~~example/markdown\n((3))\n~~~~',
         '((4))',
       ].join('\n\n')).children);
-      const note = html('ol');
       for (let i = 0; i < 3; ++i) {
-        [...annotation(target, note)];
+        [...annotation(target)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
             '<blockquote><blockquote><section><p><sup class="annotation disabled" title="1"><span></span><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>1</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote><section><p><sup class="annotation disabled" title="2"><span></span><a>*1</a></sup><br>~~~</p><ol class="annotations"><li data-marker="*1"><span>2</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote>',
             '<aside class="example" data-type="markdown"><pre translate="no">((3))</pre><hr><section><p><sup class="annotation disabled" title="3"><span></span><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>3</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></aside>',
             '<p><sup class="annotation" id="annotation::ref:4:1" title="4"><span></span><a href="#annotation::def:4:1">*1</a></sup></p>',
+            '<ol class="annotations"><li id="annotation::def:4:1" data-marker="*1"><span>4</span><sup><a href="#annotation::ref:4:1">^1</a></sup></li></ol>',
           ]);
-        assert.deepStrictEqual(
-          note.outerHTML,
-          '<ol><li id="annotation::def:4:1"><span>4</span><sup><a href="#annotation::ref:4:1">^1</a></sup></li></ol>');
       }
     });
 
@@ -235,9 +215,8 @@ describe('Unit: parser/processor/note', () => {
 
     it('id', () => {
       const target = parse('((a b))');
-      const note = html('ol');
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target, note, { id: '0' })].length, i === 0 ? 2 : 1);
+        assert.deepStrictEqual([...annotation(target, undefined, { id: '0' })].length, i === 0 ? 2 : 1);
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -247,15 +226,13 @@ describe('Unit: parser/processor/note', () => {
                 html('a', { href: '#annotation:0:def:a_b:1' }, '*1')
               ]),
             ]).outerHTML,
+            html('ol', { class: 'annotations' }, [
+              html('li', { id: 'annotation:0:def:a_b:1', 'data-marker': '*1' }, [
+                html('span', 'a b'),
+                html('sup', [html('a', { href: '#annotation:0:ref:a_b:1' }, '^1')]),
+              ]),
+            ]).outerHTML,
           ]);
-        assert.deepStrictEqual(
-          note.outerHTML,
-          html('ol', [
-            html('li', { id: 'annotation:0:def:a_b:1' }, [
-              html('span', 'a b'),
-              html('sup', [html('a', { href: '#annotation:0:ref:a_b:1' }, '^1')]),
-            ]),
-          ]).outerHTML);
       }
     });
 

package/src/parser/processor/note.ts

@@ -12,11 +12,6 @@ export function* note(
   opts: { readonly id?: string; } = {},
   bottom: Node | null = null,
 ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
-  for (let es = target.querySelectorAll(`.annotations`),
-           len = es.length, i = 0; i < len; ++i) {
-    const el = es[i];
-    el.parentNode === target && el.remove();
-  }
   yield* annotation(target, notes?.annotations, opts, bottom);
   yield* reference(target, notes?.references, opts, bottom);
   return;
@@ -31,6 +26,7 @@ function build(
   splitter: string = '',
 ) {
   assert(syntax.match(/^[a-z]+$/));
+  splitter &&= `${splitter}, .${syntax}s`;
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
   // 構文ごとに各1回の処理では不可能
   const memory = memoize((ref: HTMLElement): {
@@ -70,8 +66,8 @@ function build(
     const titles = new Map<string, string>();
     const defIndexes = new Map<HTMLLIElement, number>();
     const refSubindexes = new Map<string, number>();
-    const defSubindexes = splitter && refs.length > 0 ? new Map<string, number>() : undefined;
-    const splitters = splitter && refs.length > 0 ? target.querySelectorAll(splitter) : [];
+    const defSubindexes = new Map<string, number>();
+    const splitters = splitter ? target.querySelectorAll(splitter) : [];
     let iSplitters = 0;
     let total = 0;
     let format: 'number' | 'abbr';
@@ -84,17 +80,25 @@ function build(
       }
       if (splitter) for (
         let el: Element;
-        (el = splitters[iSplitters])?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING;
+        el = splitters[iSplitters],
+        el?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING;
         ++iSplitters) {
+        if (~iSplitters << 32 - 8 === 0) yield;
         if (el.parentNode !== target) continue;
+        if (el.tagName === 'OL' && el.nextElementSibling !== splitters[iSplitters + 1]) {
+          assert(el.matches(`.${syntax}s`));
+          el.remove();
+          continue;
+        }
         if (defs.size > 0) {
           total += defs.size;
-          yield* proc(defs, target.insertBefore(html('ol', { class: `${syntax}s` }), el));
+          const note = el.tagName === 'OL'
+            ? el as HTMLOListElement
+            : target.insertBefore(html('ol', { class: `${syntax}s` }), el);
+          assert(note.parentNode);
+          yield* proc(defs, note);
           assert(defs.size === 0);
         }
-        else if (~iSplitters % 128 === 0) {
-          yield;
-        }
       }
       const { content, identifier, abbr, text } = memory(ref);
       const refSubindex = refSubindexes.get(identifier)! + 1 || 1;
@@ -158,7 +162,22 @@ function build(
           `^${++refIndex}`));
     }
     if (note || defs.size > 0) {
-      yield* proc(defs, note ?? target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[iSplitters] ?? bottom));
+      const el = splitters[iSplitters];
+      note ??= el?.tagName === 'OL' && el.nextElementSibling == splitters[iSplitters + 1]
+        ? (++iSplitters, el as HTMLOListElement)
+        : target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[iSplitters] ?? bottom);
+      yield* proc(defs, note);
+    }
+    if (splitter) for (
+      let el: Element;
+      el = splitters[iSplitters];
+      ++iSplitters) {
+      if (~iSplitters << 32 - 8 === 0) yield;
+      if (el.parentNode !== target) continue;
+      if (el.tagName === 'OL') {
+        assert(el.matches(`.${syntax}s`));
+        el.remove();
+      }
     }
     return;
   }