securemark 0.240.2 → 0.243.0

package/src/parser/inline/template.ts

@@ -2,7 +2,7 @@ import { undefined } from 'spica/global';
 import { TemplateParser } from '../inline';
 import { union, some, rewrite, creator, surround, lazy } from '../../combinator';
 import { escsource, str } from '../source';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const template: TemplateParser = lazy(() => creator(rewrite(

package/src/parser/locale.ts

@@ -1,7 +1,7 @@
 import { Parser } from '../combinator/data/parser';
 import { fmap } from '../combinator';
 import { japanese } from './locale/ja';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 export function localize<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function localize(parser: Parser<HTMLElement | string>): Parser<HTMLElement | string> {

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

@@ -1,6 +1,6 @@
 import { figure } from './figure';
 import { parse as parse_ } from '../../parser';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 import { normalize } from '../../debug.test';
 
 const parse = (s: string) => parse_(s, { test: true });

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 { define } from 'typed-dom';
+import { define } from 'typed-dom/dom';
 import { MultiMap } from 'spica/multimap';
 import { push, join } from 'spica/array';
 
@@ -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.test.ts

@@ -1,6 +1,6 @@
 import { annotation, reference } from './footnote';
 import { parse as parse_ } from '../../parser';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 const parse = (s: string) => parse_(s, { test: true });
 

package/src/parser/processor/footnote.ts

@@ -1,6 +1,6 @@
 import { undefined, Infinity, Map, WeakMap } from 'spica/global';
 import { text } from '../inline/extension/indexee';
-import { frag, html, define } from 'typed-dom';
+import { frag, html, define } from 'typed-dom/dom';
 import { MultiMap } from 'spica/multimap';
 import { memoize } from 'spica/memoize';
 
@@ -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];
@@ -127,12 +127,13 @@ function build(
     }
     if (!footnote) return;
     const { children } = footnote;
+    const size = defs.size;
     let count = 0;
     let length = children.length;
     I:
     for (const def of defs.values()) {
       ++count;
-      while (length > defs.size) {
+      while (length > size) {
         const node = children[count - 1] as HTMLLIElement;
         if (equal(node, def)) continue I;
         yield footnote.removeChild(node);
@@ -148,8 +149,8 @@ function build(
       ++length;
       assert(children.length === length);
     }
-    while (length > defs.size) {
-      yield footnote.removeChild(children[defs.size] as HTMLLIElement);
+    while (length > size) {
+      yield footnote.removeChild(children[size] as HTMLLIElement);
       --length;
       assert(children.length === length);
     }

package/src/parser/source/text.ts

@@ -2,7 +2,7 @@ import { undefined } from 'spica/global';
 import { TextParser, TxtParser, LinebreakParser } from '../source';
 import { union, focus, creator } from '../../combinator';
 import { str } from './str';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 export const separator = /[\s\x00-\x7F]|\S#|[、。！？][^\S\n]*(?=\\\n)/;
 export const nonWhitespace = /[\S\n]|$/;

package/src/renderer/render/math.ts

@@ -1,6 +1,6 @@
 import { undefined } from 'spica/global';
 import { Collection } from 'spica/collection';
-import { html, define } from 'typed-dom';
+import { html, define } from 'typed-dom/dom';
 
 export function math(target: HTMLElement, cache?: Collection<string, HTMLElement>): void {
   assert(target.children.length === 0);

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

@@ -1,4 +1,4 @@
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 const extensions = [
   '.oga',

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

@@ -1,4 +1,4 @@
-import { define } from 'typed-dom';
+import { define } from 'typed-dom/dom';
 import { Collection } from 'spica/collection';
 import { ObjectFromEntries } from 'spica/alias';
 

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

@@ -1,5 +1,5 @@
 import { parse } from '../../../parser';
-import { html, define } from 'typed-dom';
+import { html, define } from 'typed-dom/dom';
 
 const extensions = [
   '.pdf',

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';
+import { html as h, define } from 'typed-dom/dom';
 import { sanitize } from 'dompurify';
 
 declare global {
@@ -21,26 +21,24 @@ 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;
-  return HTML.div({ class: source.className, 'data-type': 'twitter' },
-    [HTML.em(`Loading ${source.getAttribute('data-src')}...`)],
-    (h, tag) => {
-      const el = h(tag);
-      $.ajax(`https://publish.twitter.com/oembed?url=${url.href.replace('?', '&')}&omit_script=true`, {
-        dataType: 'jsonp',
-        timeout: 10 * 1e3,
-        cache: true,
-        success({ html }): void {
-          el.innerHTML = sanitize(html);
-          if (window.twttr) return void window.twttr.widgets.load(el);
-          const id = 'twitter-wjs';
-          if (document.getElementById(id)) return;
-          document.body.appendChild(h('script', { id, src: 'https://platform.twitter.com/widgets.js' }));
-        },
-        error({ status, statusText }) {
-          assert(Number.isSafeInteger(status));
-          define(el, [parse(`*{ ${source.getAttribute('data-src')} }*\n\n\`\`\`\n${status}\n${statusText}\n\`\`\``)]);
-        },
-      });
-      return el;
-  }).element;
+  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',
+    timeout: 10 * 1e3,
+    cache: true,
+    success({ html }): void {
+      el.innerHTML = sanitize(html);
+      if (window.twttr) return void window.twttr.widgets.load(el);
+      const id = 'twitter-wjs';
+      if (document.getElementById(id)) return;
+      document.body.appendChild(h('script', { id, src: 'https://platform.twitter.com/widgets.js' }));
+    },
+    error({ status, statusText }) {
+      assert(Number.isSafeInteger(status));
+      define(el, [parse(`*{ ${source.getAttribute('data-src')} }*\n\n\`\`\`\n${status}\n${statusText}\n\`\`\``)]);
+    },
+  });
+  return el;
 }

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

@@ -1,4 +1,4 @@
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 import { ObjectFromEntries } from 'spica/alias';
 
 const extensions = [

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

@@ -1,4 +1,4 @@
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 export function youtube(source: HTMLImageElement, url: URL): HTMLElement | undefined {
   const id = resolve(url);

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

@@ -1,6 +1,6 @@
 import { media } from './media';
 import { parse } from '../../parser';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 import { caches } from '../../parser/api';
 
 describe('Unit: renderer/render/media', () => {

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);
   }
 }

package/src/util/quote.ts

@@ -1,7 +1,7 @@
 import { Element } from 'spica/global';
 import { exec } from '../combinator/data/parser';
 import { cite } from '../parser/block/reply/cite';
-import { define } from 'typed-dom';
+import { define } from 'typed-dom/dom';
 
 export function quote(anchor: string, range: Range): string {
   if (exec(cite(`>>${anchor}`, {})) !== '') throw new Error(`Invalid anchor: ${anchor}`);

package/src/util/toc.test.ts

@@ -1,6 +1,6 @@
 import { toc } from './toc';
 import { parse } from '../parser';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 describe('Unit: util/toc', () => {
   describe('toc', () => {

package/src/util/toc.ts

@@ -1,5 +1,5 @@
 import { undefined, Array } from 'spica/global';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 import { push } from 'spica/array';
 
 // Bug: Firefox

package/src/util.ts

@@ -2,4 +2,3 @@ export { quote } from './util/quote';
 export { toc } from './util/toc';
 export { info } from './util/info';
 export { scope } from './util/scope';
-export { sync } from './util/sync';

package/src/util/sync.ts

@@ -1,57 +0,0 @@
-import { undefined, window, document } from 'spica/global';
-import { abs, ceil, sign } from 'spica/alias';
-import { aggregate } from 'spica/arrow';
-import { clear } from 'spica/function';
-import { bind, once } from 'typed-dom';
-
-export function sync(
-  editor: HTMLElement,
-  viewer: HTMLElement,
-  bottom: Element | null = viewer.firstElementChild,
-): () => void {
-  let hover = document.activeElement?.contains(editor) ?? true;
-  let scroll = editor.scrollTop;
-  return clear(aggregate(
-    once(viewer, 'mousemove', () => {
-      hover = false;
-    }, passive),
-    once(viewer, 'mousedown', () => {
-      hover = false;
-    }, passive),
-    once(viewer, 'wheel', () => {
-      hover = false;
-    }, passive),
-    bind(editor, 'input', () => {
-      hover = true;
-    }, passive),
-    bind(editor, 'keydown', () => {
-      hover = true;
-    }, passive),
-    bind(editor, 'mouseenter', () => {
-      hover = true;
-    }, passive),
-    bind(editor, 'mouseleave', () => {
-      hover = false;
-    }, passive),
-    bind(editor, 'scroll', () => {
-      if (!hover) return scroll = editor.scrollTop, undefined;
-      const delta = editor.scrollTop - scroll;
-      switch (scroll += delta) {
-        case 0:
-          return void viewer.scrollTo({ top: 0 });
-        default:
-          const last = bottom?.previousElementSibling as HTMLElement | null;
-          const viewer_scrollHeight = last
-            ? last.offsetTop + last.offsetHeight + +window.getComputedStyle(last).marginBottom.slice(0, -2)
-            : viewer.scrollHeight;
-          return void viewer.scrollBy({
-            top: sign(delta) * ceil(
-              + abs(delta)
-              * (viewer_scrollHeight - viewer.clientHeight)
-              / (editor.scrollHeight - editor.clientHeight)),
-          });
-      }
-    }, passive)));
-}
-
-const passive = { passive: true };