securemark 0.280.8 → 0.281.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.280.8",
+  "version": "0.281.0",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -28,38 +28,38 @@
     "LICENSE"
   ],
   "dependencies": {
-    "spica": "0.0.761"
+    "spica": "0.0.804"
   },
   "devDependencies": {
-    "@types/dompurify": "3.0.4",
-    "@types/jquery": "3.5.26",
-    "@types/mathjax": "0.0.39",
-    "@types/mocha": "10.0.3",
-    "@types/power-assert": "1.5.10",
-    "@types/prismjs": "1.26.2",
-    "@typescript-eslint/parser": "^6.10.0",
+    "@types/dompurify": "3.0.5",
+    "@types/jquery": "3.5.30",
+    "@types/mathjax": "0.0.40",
+    "@types/mocha": "10.0.7",
+    "@types/power-assert": "1.5.12",
+    "@types/prismjs": "1.26.4",
+    "@typescript-eslint/parser": "^8.0.0",
     "babel-loader": "^9.1.3",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^8.2.2",
-    "eslint": "^8.53.0",
+    "eslint": "^9.8.0",
     "eslint-plugin-redos": "^4.4.5",
-    "eslint-webpack-plugin": "^4.0.1",
-    "glob": "^10.3.10",
-    "karma": "^6.4.2",
+    "eslint-webpack-plugin": "^4.2.0",
+    "glob": "^11.0.0",
+    "karma": "^6.4.4",
     "karma-chrome-launcher": "^3.2.0",
     "karma-coverage": "^2.2.1",
-    "karma-firefox-launcher": "^2.1.2",
+    "karma-firefox-launcher": "^2.1.3",
     "karma-mocha": "^2.0.1",
     "karma-power-assert": "^1.0.0",
-    "mocha": "^10.2.0",
-    "npm-check-updates": "^16.14.6",
-    "semver": "^7.5.4",
-    "ts-loader": "^9.5.0",
-    "typed-dom": "0.0.348",
-    "typescript": "5.2.2",
-    "webpack": "^5.89.0",
+    "mocha": "^10.7.0",
+    "npm-check-updates": "^17.0.2",
+    "semver": "^7.6.3",
+    "ts-loader": "^9.5.1",
+    "typed-dom": "0.0.349",
+    "typescript": "5.4.5",
+    "webpack": "^5.93.0",
     "webpack-cli": "^5.1.4",
-    "webpack-merge": "^5.10.0"
+    "webpack-merge": "^6.0.1"
   },
   "scripts": {
     "update": "ncu -u && npm i --no-shrinkwrap && bundle update",

package/src/combinator/data/parser/context/memo.ts

@@ -14,6 +14,7 @@ export class Memo {
     syntax: number,
     state: number,
   ): readonly [any[], number] | readonly [] | undefined {
+    assert(position > 0);
     if (this.count === 0) return;
     //console.log('get', position, syntax, state, this.memory[position - 1]?.[syntax]?.[state]);
     const cache = this.memory[position - 1]?.[syntax]?.[state];
@@ -28,6 +29,7 @@ export class Memo {
     nodes: any[] | undefined,
     offset: number,
   ): void {
+    assert(position > 0);
     this.count += +!this.memory[position - 1];
     const record = this.memory[position - 1] ??= {};
     assert(!record[syntax]?.[state]);

package/src/parser/api/cache.ts

@@ -1,11 +1,28 @@
 import { Caches } from '../../..';
-import { Cache } from 'spica/cache';
-import { Clock } from 'spica/clock';
+import { TClock } from 'spica/tclock';
+import { TLRU } from 'spica/tlru';
 
 // For rerendering in editing.
 
+/*
+同一文書内で複数回使用される可能性が低いデータ: TClock
+同一文書内で複数回使用される可能性が高いデータ: TLRU
+
+編集時の再描画高速化が主目的であるためブロックを周期とするループおよび
+異なるブロックへのジャンプに適したアルゴリズムを使用。
+キャッシュサイズはブロック内の全データをキャッシュできなければならない。
+キャッシュサイズは100あれば足りるが10,000までは速度低下しないようなので
+データサイズを加味して100から1,000とする。
+遠くで少数の同じデータを高速描画してもあまり意味はない。
+タイムラインとスレッドのmediaにおいても多数の同一データが長周期で複数回表示
+される適切な状況はないと思われる。
+同一投稿は頻繁に再送されてはならずスパムは削除されなければならず
+ジャーゴンは考慮に値しない。
+
+*/
+
 export const caches: Caches = {
-  code: new Clock<string, HTMLElement>(1000),
-  math: new Cache<string, HTMLElement>(1000),
-  media: new Clock<string, HTMLElement>(100),
+  code: new TClock<string, HTMLElement>(1000),
+  math: new TLRU<string, HTMLElement>(1000),
+  media: new TClock<string, HTMLElement>(100),
 } as const;

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

@@ -34,7 +34,7 @@ describe('Unit: parser/block/heading', () => {
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('# a')), [['<h1 id="index::a">a</h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a ')), [['<h1 id="index::a">a</h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# a b  c \n')), [['<h1 id="index::a_b_c">a b  c</h1>'], '']);
+      assert.deepStrictEqual(inspect(parser('# a b  c \n')), [['<h1 id="index::a_b__c">a b  c</h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a\n')), [['<h1 id="index::a">a</h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# *a*`b`${c}$')), [['<h1 id="index::a`b`${c}$"><em>a</em><code data-src="`b`">b</code><span class="math" translate="no" data-src="${c}$">${c}$</span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a\\')), [['<h1 id="index::a">a</h1>'], '']);

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

@@ -45,7 +45,7 @@ describe('Unit: parser/inline/extension/index', () => {
       assert.deepStrictEqual(inspect(parser('[#a ]')), [['<a class="index" href="#index::a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a  ]')), [['<a class="index" href="#index::a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a b]')), [['<a class="index" href="#index::a_b">a b</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a  b]')), [['<a class="index" href="#index::a_b">a  b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a  b]')), [['<a class="index" href="#index::a__b">a  b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a \\ ]')), [['<a class="index" href="#index::a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a &nbsp;]')), [['<a class="index" href="#index::a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a <wbr>]')), [['<a class="index" href="#index::a">a</a>'], '']);
@@ -84,7 +84,7 @@ describe('Unit: parser/inline/extension/index', () => {
       assert.deepStrictEqual(inspect(parser('[#a|\\b]')), [['<a class="index" href="#index::b">a<span class="indexer" data-index="b"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a|*b*]')), [['<a class="index" href="#index::*b*">a<span class="indexer" data-index="*b*"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a|b c]')), [['<a class="index" href="#index::b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a|b  c]')), [['<a class="index" href="#index::b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|b  c]')), [['<a class="index" href="#index::b__c">a<span class="indexer" data-index="b__c"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a|[]]')), [['<a class="index" href="#index::[]">a<span class="indexer" data-index="[]"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a|&copy;]')), [['<a class="index" href="#index::&amp;copy;">a<span class="indexer" data-index="&amp;copy;"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a |b]')), [['<a class="index" href="#index::b">a<span class="indexer" data-index="b"></span></a>'], '']);

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

@@ -9,31 +9,59 @@ export function indexee(parser: Parser<HTMLElement, MarkdownParser.Context>, opt
   return fmap(parser, ([el], _, { id }) => [define(el, { id: identity(id, index(el, optional)) })]);
 }
 
-export function identity(id: string | undefined, text: string, type: 'index' | 'mark' | '' = 'index'): string | undefined {
+const MAX = 60;
+const ELLIPSIS = '...';
+const PART = (MAX - ELLIPSIS.length) / 2 | 0;
+const REM = MAX - PART * 2 - ELLIPSIS.length;
+export function identity(
+  id: string | undefined,
+  text: string,
+  type: 'index' | 'mark' | '' = 'index',
+): string | undefined {
   assert(!id?.match(/[^0-9a-z/-]/i));
   assert(!text.includes('\n'));
   if (id === '') return undefined;
-  text &&= text.trim().replace(/\s\s+/g, ' ');
+  text = text.trim();
   if (text === '') return undefined;
-  const hash = text.replace(/\s/g, '_');
-  if (hash.length <= 120 || type === '') return `${type}:${id ?? ''}:${hash}`;
-  const cs = [...text];
-  if (cs.length <= 120) return `${type}:${id ?? ''}:${hash}`;
-  const ellipsis = '...';
-  const len = (120 - ellipsis.length * 2) / 3 | 0;
+  const str = text.replace(/\s/g, '_');
+  if (str.length <= MAX || type === '') return `${type}:${id ?? ''}:${str}`;
+  const cs = [...str];
+  if (cs.length <= MAX) return `${type}:${id ?? ''}:${str}`;
   switch (type) {
     case 'index':
     case 'mark':
-      const s1 = hash.slice(0, cs.slice(0, len).join('').trimEnd().length);
-      const s3 = hash.slice(-cs.slice(-len).join('').trimStart().length);
-      const s2 = cs.slice(cs.length / 2 - len / 2 - (len - s1.length) | 0).slice(0, len + len - s3.length).join('').trim().replace(/\s/g, '_');
-      return `${type}:${id ?? ''}:${s1}${ellipsis}${s2}${ellipsis}${s3}`;
+      const s1 = cs.slice(0, PART + REM).join('');
+      const s2 = cs.slice(-PART).join('');
+      return `${type}:${id ?? ''}:${s1}${ELLIPSIS}${s2}=${hash(text).toString(36)}`;
   }
   assert(false);
 }
-assert(identity(undefined, '0'.repeat(120 - 1) + 1)!.slice(7) === '0'.repeat(120 - 1) + 1);
-assert(identity(undefined, '0'.repeat(41) + '1'.repeat(38) + '2'.repeat(41) + 3)!.slice(7) === '0'.repeat(38) + '...' + '1'.repeat(38) + '...' + '2'.repeat(38 - 1) + 3);
-assert(identity(undefined, '0'.repeat(81) + '1'.repeat(38) + '2'.repeat(81) + 3)!.slice(7) === '0'.repeat(38) + '...' + '1'.repeat(38) + '...' + '2'.repeat(38 - 1) + 3);
+function hash(source: string): number {
+  let x = 1;
+  assert(x !== 0);
+  for (let i = 0; i < source.length; ++i) {
+    x ^= x << 13;
+    x ^= x >>> 17;
+    x ^= x << 15;
+    x ^= source.charCodeAt(i) << 11;
+  }
+  return x >>> 0;
+}
+assert.deepStrictEqual(
+  identity(undefined, `${'0'.repeat(MAX - 1)}1`)!.slice(7),
+  `${'0'.repeat(MAX - 1)}1`);
+assert.deepStrictEqual(
+  identity(undefined, `0${'1'.repeat(MAX / 2)}${'2'.repeat(MAX / 2)}3`)!.slice(7),
+  `0${'1'.repeat(PART + REM - 1)}${ELLIPSIS}${'2'.repeat(PART - 1)}3=x8ujbi`);
+assert.deepStrictEqual(
+  identity(undefined, `0${'1'.repeat(MAX * 2)}${'2'.repeat(MAX * 2)}3`)!.slice(7),
+  `0${'1'.repeat(PART + REM - 1)}${ELLIPSIS}${'2'.repeat(PART - 1)}3=1c1m3g9`);
+assert.deepStrictEqual(
+  identity(undefined, ` ${'0 '.repeat(MAX)}`)!.slice(7),
+  identity(undefined, ` ${'0 '.repeat(MAX)}`.trim())!.slice(7));
+assert.notDeepStrictEqual(
+  identity(undefined, `${'0 '.repeat(MAX)}`)!.slice(7),
+  identity(undefined, `${'0_'.repeat(MAX)}`)!.slice(7));
 
 export function index(source: Element, optional = false): string {
   assert(!source.matches('.indexer'));
@@ -41,7 +69,7 @@ export function index(source: Element, optional = false): string {
   if (!source.firstChild) return '';
   const indexer = source.querySelector(':scope > .indexer');
   const index = indexer?.getAttribute('data-index');
-  if (index) return index;
+  if (index) return index.replace(/=\w+$/, '');
   if (index === '' && optional) return '';
   return signature(source);
 }

package/src/parser/inline/extension/indexer.test.ts

@@ -24,7 +24,7 @@ describe('Unit: parser/inline/extension/indexer', () => {
       assert.deepStrictEqual(inspect(parser(' [|a ]')), [['<span class="indexer" data-index="a"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [|a  ]')), [['<span class="indexer" data-index="a"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [|a b]')), [['<span class="indexer" data-index="a_b"></span>'], '']);
-      assert.deepStrictEqual(inspect(parser(' [|a  b]')), [['<span class="indexer" data-index="a_b"></span>'], '']);
+      assert.deepStrictEqual(inspect(parser(' [|a  b]')), [['<span class="indexer" data-index="a__b"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [|A]')), [['<span class="indexer" data-index="A"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [|*A*]')), [['<span class="indexer" data-index="*A*"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [|`A`]')), [['<span class="indexer" data-index="`A`"></span>'], '']);

package/src/parser/processor/note.ts

@@ -85,7 +85,7 @@ function build(
         ++iSplitters) {
         if (~iSplitters << 32 - 8 === 0) yield;
         if (!scope && el.parentNode !== target) continue;
-        if (el.tagName === 'OL' && el.nextElementSibling !== splitters[iSplitters + 1]) {
+        if (el.tagName === 'OL' && (el.nextElementSibling !== splitters[iSplitters + 1] || defs.size === 0)) {
           assert(el.matches(`.${syntax}s`));
           el.remove();
           continue;