securemark 0.280.7 → 0.280.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.280.7",
+  "version": "0.280.9",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -27,37 +27,39 @@
     "NOTICE",
     "LICENSE"
   ],
+  "dependencies": {
+    "spica": "0.0.781"
+  },
   "devDependencies": {
-    "@types/dompurify": "3.0.2",
-    "@types/jquery": "3.5.16",
-    "@types/mathjax": "0.0.37",
-    "@types/mocha": "10.0.1",
-    "@types/power-assert": "1.5.8",
-    "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.59.9",
-    "babel-loader": "^9.1.2",
+    "@types/dompurify": "3.0.5",
+    "@types/jquery": "3.5.29",
+    "@types/mathjax": "0.0.40",
+    "@types/mocha": "10.0.6",
+    "@types/power-assert": "1.5.12",
+    "@types/prismjs": "1.26.3",
+    "@typescript-eslint/parser": "^6.21.0",
+    "babel-loader": "^9.1.3",
     "babel-plugin-unassert": "^3.2.0",
-    "concurrently": "^8.1.0",
-    "eslint": "^8.42.0",
+    "concurrently": "^8.2.2",
+    "eslint": "^8.56.0",
     "eslint-plugin-redos": "^4.4.5",
     "eslint-webpack-plugin": "^4.0.1",
-    "glob": "^10.2.7",
+    "glob": "^10.3.10",
     "karma": "^6.4.2",
     "karma-chrome-launcher": "^3.2.0",
-    "karma-coverage": "^2.2.0",
+    "karma-coverage": "^2.2.1",
     "karma-firefox-launcher": "^2.1.2",
     "karma-mocha": "^2.0.1",
     "karma-power-assert": "^1.0.0",
-    "mocha": "^10.2.0",
-    "npm-check-updates": "^16.10.12",
-    "semver": "^7.5.1",
-    "spica": "0.0.732",
-    "ts-loader": "^9.4.3",
-    "typed-dom": "0.0.336",
-    "typescript": "5.1.3",
-    "webpack": "^5.85.1",
-    "webpack-cli": "^5.1.3",
-    "webpack-merge": "^5.9.0"
+    "mocha": "^10.3.0",
+    "npm-check-updates": "^16.14.15",
+    "semver": "^7.6.0",
+    "ts-loader": "^9.5.1",
+    "typed-dom": "0.0.348",
+    "typescript": "5.3.3",
+    "webpack": "^5.90.1",
+    "webpack-cli": "^5.1.4",
+    "webpack-merge": "^5.10.0"
   },
   "scripts": {
     "update": "ncu -u && npm i --no-shrinkwrap && bundle update",

package/src/parser/api/cache.ts

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

package/src/parser/processor/note.ts

@@ -180,37 +180,37 @@ function build(
       }
     }
   }
+}
 
-  function* proc(defs: Map<string, HTMLLIElement>, note: HTMLOListElement): Generator<HTMLLIElement | undefined, undefined, undefined> {
-    const { children } = note;
-    const size = defs.size;
-    let count = 0;
-    let length = children.length;
-    I:
-    for (const [key, def] of defs) {
-      defs.delete(key);
-      ++count;
-      while (length > size) {
-        const node = children[count - 1] as HTMLLIElement;
-        if (equal(node, def)) continue I;
-        yield note.removeChild(node);
-        --length;
-        assert(children.length === length);
-      }
-      const node = count <= length
-        ? children[count - 1]
-        : null;
-      if (node && equal(node, def)) continue;
-      assert(def.parentNode !== note);
-      yield note.insertBefore(def, node);
-      ++length;
-      assert(children.length === length);
-    }
+function* proc(defs: Map<string, HTMLLIElement>, note: HTMLOListElement): Generator<HTMLLIElement | undefined, undefined, undefined> {
+  const { children } = note;
+  const size = defs.size;
+  let count = 0;
+  let length = children.length;
+  I:
+  for (const [key, def] of defs) {
+    defs.delete(key);
+    ++count;
     while (length > size) {
-      yield note.removeChild(children[size] as HTMLLIElement);
+      const node = children[count - 1] as HTMLLIElement;
+      if (equal(node, def)) continue I;
+      yield note.removeChild(node);
       --length;
       assert(children.length === length);
     }
+    const node = count <= length
+      ? children[count - 1]
+      : null;
+    if (node && equal(node, def)) continue;
+    assert(def.parentNode !== note);
+    yield note.insertBefore(def, node);
+    ++length;
+    assert(children.length === length);
+  }
+  while (length > size) {
+    yield note.removeChild(children[size] as HTMLLIElement);
+    --length;
+    assert(children.length === length);
   }
 }