securemark 0.241.0 → 0.243.1

package/src/parser/processor/figure.ts

@@ -12,9 +12,9 @@ export function* figure(
   }> = {},
 ): Generator<HTMLAnchorElement | undefined, undefined, undefined> {
   const refs = new MultiMap<string, HTMLAnchorElement>(push(push(push([],
-    target.querySelectorAll<HTMLAnchorElement>('a.label:not(.disabled)[data-label]')),
-    footnotes?.annotations.querySelectorAll<HTMLAnchorElement>('a.label:not(.disabled)') ?? []),
-    footnotes?.references.querySelectorAll<HTMLAnchorElement>('a.label:not(.disabled)') ?? [])
+    target.querySelectorAll('a.label:not(.disabled)[data-label]')),
+    footnotes?.annotations.querySelectorAll('a.label:not(.disabled)') ?? []),
+    footnotes?.references.querySelectorAll('a.label:not(.disabled)') ?? [])
     .map(el => [el.getAttribute('data-label')!, el]));
   const labels = new Set<string>();
   const numbers = new Map<string, string>();

package/src/parser/processor/footnote.ts

@@ -42,7 +42,7 @@ function build(
     const check = footnotes.some(el => target.contains(el));
     let style: 'count' | 'abbr';
     for (
-      let refs = target.querySelectorAll<HTMLElement>(`sup.${syntax}:not(.disabled)`),
+      let refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`),
           i = 0, len = refs.length; i < len; ++i) {
       yield;
       const ref = refs[i];

package/src/renderer/render/media/twitter.ts

@@ -1,6 +1,6 @@
 import { window, document } from 'spica/global';
 import { parse } from '../../../parser';
-import { html, define } from 'typed-dom/dom';
+import { html as h, define } from 'typed-dom/dom';
 import { sanitize } from 'dompurify';
 
 declare global {
@@ -21,8 +21,8 @@ export function twitter(source: HTMLImageElement, url: URL): HTMLElement | undef
   if (!origins.includes(url.origin)) return;
   if (url.pathname.split('/').pop()!.includes('.')) return;
   if (!url.pathname.match(/^\/\w+\/status\/[0-9]{15,}(?!\w)/)) return;
-  const el = html('div', { class: source.className, 'data-type': 'twitter' }, [
-    html('em', `Loading ${source.getAttribute('data-src')}...`),
+  const el = h('div', { class: source.className, 'data-type': 'twitter' }, [
+    h('em', `Loading ${source.getAttribute('data-src')}...`),
   ]);
   $.ajax(`https://publish.twitter.com/oembed?url=${url.href.replace('?', '&')}&omit_script=true`, {
     dataType: 'jsonp',
@@ -33,7 +33,7 @@ export function twitter(source: HTMLImageElement, url: URL): HTMLElement | undef
       if (window.twttr) return void window.twttr.widgets.load(el);
       const id = 'twitter-wjs';
       if (document.getElementById(id)) return;
-      document.body.appendChild(html('script', { id, src: 'https://platform.twitter.com/widgets.js' }));
+      document.body.appendChild(h('script', { id, src: 'https://platform.twitter.com/widgets.js' }));
     },
     error({ status, statusText }) {
       assert(Number.isSafeInteger(status));

package/src/renderer/render.ts

@@ -3,6 +3,7 @@ import { RenderingOptions } from '../../';
 import { code } from './render/code';
 import { math } from './render/math';
 import { media } from './render/media';
+import { querySelectorAll } from 'typed-dom/query';
 import { reduce } from 'spica/memoize';
 
 const selector = 'img.media:not(.invalid):not([src])[data-src], a > :not(img).media:not(.invalid), pre.code:not(.invalid), .math:not(.invalid)';
@@ -13,11 +14,8 @@ const extend = reduce((opts: RenderingOptions): RenderingOptions =>
 export function render(source: HTMLElement, opts: RenderingOptions = {}): void {
   opts = extend(opts);
   const base = location.href;
-  if (source.matches(selector)) return void render_(base, source, opts);
-  for (
-    let es = source.querySelectorAll<HTMLElement>(selector),
-        i = 0, len = es.length; i < len; ++i) {
-    render_(base, es[i], opts);
+  for (const el of querySelectorAll<HTMLElement>(source, selector)) {
+    render_(base, el, opts);
   }
 }
 

package/src/util/info.ts

@@ -1,5 +1,6 @@
 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,12 +20,7 @@ export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info
   };
 
   function find<T extends HTMLElement>(selector: string): T[] {
-    const acc: T[] = [];
-    for (let es = source.querySelectorAll<T>(selector), i = 0, len = es.length; i < len; ++i) {
-      const el = es[i];
-      if (!match(el)) continue;
-      acc.push(el);
-    }
-    return acc;
+    return querySelectorAll<T>(source, selector)
+      .filter(match);
   }
 }