securemark 0.262.0 → 0.262.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.262.0",
+  "version": "0.262.2",
   "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": "9.1.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.36.2",
+    "@typescript-eslint/parser": "^5.37.0",
     "babel-loader": "^8.2.5",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^7.4.0",
-    "eslint": "^8.23.0",
+    "eslint": "^8.23.1",
     "eslint-plugin-redos": "^4.4.1",
     "eslint-webpack-plugin": "^3.2.0",
     "glob": "^8.0.3",
@@ -49,11 +49,11 @@
     "karma-mocha": "^2.0.1",
     "karma-power-assert": "^1.0.0",
     "mocha": "^10.0.0",
-    "npm-check-updates": "^16.1.1",
+    "npm-check-updates": "^16.1.3",
     "semver": "^7.3.7",
-    "spica": "0.0.622",
+    "spica": "0.0.626",
     "ts-loader": "^9.3.1",
-    "typed-dom": "^0.0.305",
+    "typed-dom": "^0.0.309",
     "typescript": "4.8.3",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",

package/src/combinator/control/constraint/contract.ts

@@ -1,4 +1,4 @@
-import { undefined, Function } from 'spica/global';
+import { global, undefined } from 'spica/global';
 import { isArray } from 'spica/alias';
 import { Parser, Ctx, Tree, Context, eval, exec, check } from '../../data/parser';
 
@@ -15,15 +15,13 @@ export function validate<T>(patterns: string | RegExp | (string | RegExp)[], has
   assert(patterns.length > 0);
   assert(patterns.every(pattern => pattern instanceof RegExp ? !pattern.flags.match(/[gmy]/) && pattern.source.startsWith('^') : true));
   assert(parser);
-  const match: (source: string) => boolean = Function([
-    '"use strict";',
-    'return source =>',
-    '0',
-    ...patterns.map(pattern =>
+  const match: (source: string) => boolean = global.eval([
+    'source =>',
+    patterns.map(pattern =>
       typeof pattern === 'string'
         ? `|| source.slice(0, ${pattern.length}) === '${pattern}'`
-        : `|| /${pattern.source}/${pattern.flags}.test(source)`),
-  ].join(''))();
+        : `|| /${pattern.source}/${pattern.flags}.test(source)`).join('').slice(2),
+  ].join(''));
   return ({ source, context }) => {
     if (source === '') return;
     if (!match(source)) return;

package/src/combinator/data/parser/union.ts

@@ -1,4 +1,4 @@
-import { undefined, Function } from 'spica/global';
+import { undefined } from 'spica/global';
 import { Parser, Ctx, Tree, Context, SubParsers, SubTree } from '../parser';
 
 export function union<P extends Parser<unknown>>(parsers: SubParsers<P>): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
@@ -9,12 +9,17 @@ export function union<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D> {
       return () => undefined;
     case 1:
       return parsers[0];
+    case 2:
+      return input => parsers[0](input) ?? parsers[1](input);
+    case 3:
+      return input => parsers[0](input) ?? parsers[1](input) ?? parsers[2](input);
     default:
-      return Function('parsers', [
-        '"use strict";',
-        'return (input, context) =>',
-        '0',
-        ...parsers.map((_, i) => `|| parsers[${i}](input, context)`),
-      ].join('\n'))(parsers);
+      return input => {
+        for (let i = 0; i < parsers.length; ++i) {
+          const parser = parsers[i];
+          const result = parser(input);
+          if (result) return result;
+        }
+      };
   }
 }

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

@@ -3,7 +3,6 @@ import { MarkdownParser } from '../../../../markdown';
 import { Parser } from '../../../combinator/data/parser';
 import { fmap } from '../../../combinator';
 import { define } from 'typed-dom/dom';
-import { querySelectorAll } from 'typed-dom/query';
 
 export function indexee<P extends Parser<unknown, MarkdownParser.Context>>(parser: P, optional?: boolean): P;
 export function indexee(parser: Parser<HTMLElement, MarkdownParser.Context>, optional?: boolean): Parser<HTMLElement> {
@@ -28,7 +27,8 @@ export function text(source: HTMLElement | DocumentFragment, optional = false):
   if (index) return index;
   assert(!source.querySelector('.annotation, br'));
   const target = source.cloneNode(true) as typeof source;
-  for (let es = querySelectorAll(target, 'code[data-src], .math[data-src], .comment, rt, rp, .reference, .checkbox, ul, ol'), i = 0; i < es.length; ++i) {
+  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .comment, rt, rp, .reference, .checkbox, ul, ol'),
+           len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
     switch (el.tagName) {
       case 'CODE':

package/src/parser/locale.ts

@@ -2,7 +2,6 @@ import { Parser } from '../combinator/data/parser';
 import { fmap } from '../combinator';
 import { japanese } from './locale/ja';
 import { html } from 'typed-dom/dom';
-import { querySelectorAll } from 'typed-dom/query';
 
 export function localize<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function localize(parser: Parser<HTMLElement | string>): Parser<HTMLElement | string> {
@@ -11,7 +10,8 @@ export function localize(parser: Parser<HTMLElement | string>): Parser<HTMLEleme
     const el = ns.length === 1 && typeof ns[0] === 'object'
       ? ns[0]
       : html('div', ns);
-    for (let es = querySelectorAll(el, '.linebreak:not(:empty)'), i = 0; i < es.length; ++i) {
+    for (let es = el.querySelectorAll('.linebreak:not(:empty)'),
+             len = es.length, i = 0; i < len; ++i) {
       const el = es[i];
       assert(el.firstChild!.textContent === ' ');
       if (!check(el)) continue;

package/src/parser/processor/figure.ts

@@ -1,6 +1,6 @@
 import { Infinity, Set, Map } from 'spica/global';
 import { number as calculate, isFixed } from '../inline/extension/label';
-import { MultiMap } from 'spica/multimap';
+import { MultiQueue } from 'spica/queue';
 import { push } from 'spica/array';
 import { define } from 'typed-dom/dom';
 import { querySelectorAll } from 'typed-dom/query';
@@ -10,7 +10,7 @@ export function* figure(
   footnotes?: { readonly references: HTMLOListElement; },
   opts: { readonly id?: string; } = {},
 ): Generator<HTMLAnchorElement | undefined, undefined, undefined> {
-  const refs = new MultiMap<string, HTMLAnchorElement>(push(
+  const refs = new MultiQueue<string, HTMLAnchorElement>(push(
     querySelectorAll(target, 'a.label:not(.disabled)[data-label]'),
     footnotes && querySelectorAll(footnotes.references, 'a.label:not(.disabled)') || [])
     .map(el => [el.getAttribute('data-label')!, el]));
@@ -20,9 +20,9 @@ export function* figure(
   let bases: readonly string[] = base.split('.');
   let index: readonly string[] = bases;
   // Bug: Firefox
-  //for (let defs = querySelectorAll(target, ':scope > figure[data-label], :scope > h1, :scope > h2'), len = defs.length, i = 0; i < len; ++i) {
+  //for (let defs = target.querySelectorAll(':scope > figure[data-label], :scope > h1, :scope > h2'), len = defs.length, i = 0; i < len; ++i) {
   for (
-    let defs = querySelectorAll(target, 'figure[data-label], h1, h2'),
+    let defs = target.querySelectorAll('figure[data-label], h1, h2'),
         len = defs.length, i = 0; i < len; ++i) {
     yield;
     const def = defs[i];

package/src/parser/processor/footnote.ts

@@ -1,8 +1,7 @@
 import { undefined, Infinity, Map, Node } from 'spica/global';
 import { text } from '../inline/extension/indexee';
-import { MultiMap } from 'spica/multimap';
+import { MultiQueue } from 'spica/queue';
 import { frag, html, define } from 'typed-dom/dom';
-import { querySelectorAll } from 'typed-dom/query';
 
 export function* footnote(
   target: ParentNode & Node,
@@ -11,8 +10,9 @@ export function* footnote(
   bottom: Node | null = null,
 ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
   // Bug: Firefox
-  //querySelectorAll(target, `:scope > .annotations`).forEach(el => el.remove());
-  for (let es = querySelectorAll(target, `.annotations`), i = 0; i < es.length; ++i) {
+  //target.querySelectorAll(`:scope > .annotations`).forEach(el => el.remove());
+  for (let es = target.querySelectorAll(`.annotations`),
+           len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
     el.parentNode === target && el.remove();
   }
@@ -39,12 +39,13 @@ function build(
     bottom: Node | null = null,
   ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
     const defs = new Map<string, HTMLLIElement>();
-    const buffer = new MultiMap<string, HTMLElement>();
+    const buffer = new MultiQueue<string, HTMLElement>();
     const titles = new Map<string, string>();
     // Bug: Firefox
-    //const splitters = push([], querySelectorAll(target, `:scope > :is(${splitter ?? '_'})`));
+    //const splitters = push([], target.querySelectorAll(`:scope > :is(${splitter ?? '_'})`));
     const splitters: Element[] = [];
-    for (let es = querySelectorAll(target, splitter ?? '_'), i = 0; i < es.length; ++i) {
+    for (let es = target.querySelectorAll(splitter ?? '_'),
+             len = es.length, i = 0; i < len; ++i) {
       const el = es[i];
       el.parentNode === target && splitters.push(el);
     }
@@ -52,7 +53,7 @@ function build(
     let total = 0;
     let style: 'count' | 'abbr';
     for (
-      let refs = querySelectorAll(target, `sup.${syntax}:not(.disabled)`),
+      let refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`),
           len = refs.length, i = 0; i < len; ++i) {
       yield;
       const ref = refs[i];

package/src/util/info.ts

@@ -1,6 +1,5 @@
 import { Info } from '../..';
 import { scope } from './scope';
-import { querySelectorAll } from 'typed-dom/query';
 
 export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info {
   const match = scope(source, '.invalid');
@@ -19,7 +18,8 @@ export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info
 
   function find<T extends HTMLElement>(selector: string): T[] {
     const acc: T[] = [];
-    for (let es = querySelectorAll<T>(source, selector), i = 0; i < es.length; ++i) {
+    for (let es = source.querySelectorAll<T>(selector),
+             len = es.length, i = 0; i < len; ++i) {
       const el = es[i];
       match(el) && acc.push(el);
     }

package/src/util/quote.ts

@@ -2,14 +2,14 @@ import { Element } from 'spica/global';
 import { exec } from '../combinator/data/parser';
 import { cite } from '../parser/block/reply/cite';
 import { define } from 'typed-dom/dom';
-import { querySelectorAll } from 'typed-dom/query';
 
 export function quote(anchor: string, range: Range): string {
   if (exec(cite({ source: `>>${anchor}`, context: {} })) !== '') throw new Error(`Invalid anchor: ${anchor}`);
   fit(range);
   const node = trim(range.cloneContents());
   if (!node.firstChild) return '';
-  for (let es = querySelectorAll(node, 'code[data-src], .math[data-src], .media[data-src], rt, rp'), i = 0; i < es.length; ++i) {
+  for (let es = node.querySelectorAll('code[data-src], .math[data-src], .media[data-src], rt, rp'),
+           len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
     switch (true) {
       case el.matches('code'):
@@ -36,7 +36,8 @@ export function quote(anchor: string, range: Range): string {
     node.prepend(`>>${anchor}\n> `);
     anchor = '';
   }
-  for (let es = querySelectorAll(node, 'br'), i = 0; i < es.length; ++i) {
+  for (let es = node.querySelectorAll('br'),
+           len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
     if (anchor && el.nextSibling instanceof Element && el.nextSibling.matches('.cite, .quote')) {
       el.replaceWith(`\n>${el.nextSibling.matches('.quote.invalid') ? ' ' : ''}`);

package/src/util/toc.ts

@@ -1,15 +1,15 @@
 import { undefined } from 'spica/global';
 import { push } from 'spica/array';
 import { html } from 'typed-dom/dom';
-import { querySelectorAll } from 'typed-dom/query';
 
 // Bug: Firefox
-//const selector = 'h1 h2 h3 h4 h5 h6 aside.aside'.split(' ').map(s => `:scope > ${s}[id]`).join();
+//const selector = `:scope > :is(h1, h2, h3, h4, h5, h6, aside.aside)[id]`;
 const selector = ':is(h1, h2, h3, h4, h5, h6, aside.aside)[id]';
 
 export function toc(source: DocumentFragment | HTMLElement | ShadowRoot): HTMLUListElement {
   const hs: HTMLHeadingElement[] = [];
-  for (let es = querySelectorAll(source, selector), i = 0; i < es.length; ++i) {
+  for (let es = source.querySelectorAll(selector),
+           len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
     assert(el.parentNode === source);
     switch (el.tagName) {