securemark 0.267.0 → 0.268.1

package/src/parser/processor/footnote.ts

@@ -1,5 +1,4 @@
 import { text } from '../inline/extension/indexee';
-import { MultiQueue } from 'spica/queue';
 import { frag, html, define } from 'typed-dom/dom';
 
 export function* footnote(
@@ -24,7 +23,7 @@ export const reference = build('reference', (n, abbr) => `[${abbr || n}]`);
 function build(
   syntax: 'annotation' | 'reference',
   marker: (index: number, abbr: string | undefined) => string,
-  splitter?: string,
+  splitter: string = '_',
 ) {
   assert(syntax.match(/^[a-z]+$/));
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
@@ -36,21 +35,31 @@ function build(
     bottom: Node | null = null,
   ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
     const defs = new Map<string, HTMLLIElement>();
-    const buffer = new MultiQueue<string, HTMLElement>();
-    const titles = new Map<string, string>();
     const splitters: Element[] = [];
-    for (let es = target.querySelectorAll(splitter ?? '_'),
+    for (let es = target.querySelectorAll(splitter),
              len = es.length, i = 0; i < len; ++i) {
+      if (i % 100 === 0) yield;
       const el = es[i];
       el.parentNode === target && splitters.push(el);
     }
+    const refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`);
+    const titles = new Map<string, string>();
+    const contents = new Map<string, DocumentFragment>();
+    for (let len = refs.length, i = 0; i < len; ++i) {
+      if (i % 10 === 9) yield;
+      const ref = refs[i];
+      const identifier = ref.getAttribute('data-abbr') || ` ${ref.firstElementChild!.innerHTML}`;
+      if (titles.has(identifier)) continue;
+      const content = frag(ref.firstElementChild!.cloneNode(true).childNodes);
+      const title = text(content).trim();
+      if (!title) continue;
+      titles.set(identifier, title);
+      contents.set(identifier, content);
+    }
     let count = 0;
     let total = 0;
     let style: 'count' | 'abbr';
-    for (
-      let refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`),
-          len = refs.length, i = 0; i < len; ++i) {
-      yield;
+    for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
       while (splitters.length > 0
           && splitters[0].compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING) {
@@ -65,7 +74,6 @@ function build(
       }
       const identifier = ref.getAttribute('data-abbr') || ` ${ref.firstElementChild!.innerHTML}`;
       const abbr = ref.getAttribute('data-abbr') || undefined;
-      const content = frag(ref.firstElementChild!.cloneNode(true).childNodes);
       style ??= abbr ? 'abbr' : 'count';
       if (style === 'count' ? abbr : !abbr) {
         define(ref, {
@@ -89,14 +97,10 @@ function build(
       else {
         ref.lastChild?.remove();
       }
-      const title = titles.get(identifier) || text(content).trim() || undefined;
+      const title = titles.get(identifier);
       assert(title !== '');
       assert(syntax !== 'annotation' || title);
-      title
-        ? !titles.has(identifier) && titles.set(identifier, title)
-        : buffer.set(identifier, ref);
-      assert(syntax !== 'annotation' || !buffer.has(identifier));
-      const blank = !!abbr && !content.firstChild;
+      const content = frag(ref.firstElementChild!.cloneNode(true).childNodes);
       const refIndex = ++count;
       const refId = opts.id !== ''
         ? `${syntax}:${opts.id ?? ''}:ref:${refIndex}`
@@ -108,24 +112,9 @@ function build(
               id: opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${total + defs.size + 1}` : undefined,
               'data-marker': !footnote ? marker(total + defs.size + 1, abbr) : undefined,
             },
-            [content.cloneNode(true), html('sup')]))
+            [contents.get(identifier) ?? frag(), html('sup')]))
             .get(identifier)!;
       assert(def.lastChild);
-      if (title && !blank && def.childNodes.length === 1) {
-        def.insertBefore(content.cloneNode(true), def.lastChild);
-        assert(def.childNodes.length > 1);
-        for (let refs = buffer.take(identifier, Infinity), i = 0; i < refs.length; ++i) {
-          const ref = refs[i];
-          if (ref.getAttribute('data-invalid-type') !== 'content') continue;
-          define(ref, {
-            title,
-            class: void ref.classList.remove('invalid'),
-            'data-invalid-syntax': null,
-            'data-invalid-type': null,
-            'data-invalid-message': null,
-          });
-        }
-      }
       const defIndex = +def.id.slice(def.id.lastIndexOf(':') + 1) || total + defs.size;
       const defId = def.id || undefined;
       define(ref, {
@@ -145,9 +134,7 @@ function build(
         html('a',
           {
             href: refId && `#${refId}`,
-            title: abbr && !blank
-              ? title
-              : undefined,
+            title: abbr && text(content).trim() || undefined,
           },
           `^${refIndex}`));
     }

package/src/parser/source/line.ts

@@ -1,6 +1,6 @@
 import { AnyLineParser, EmptyLineParser, ContentLineParser } from '../source';
-import { line, isEmpty } from '../../combinator';
+import { line, isBlank } from '../../combinator';
 
 export const anyline: AnyLineParser = line(() => [[], '']);
-export const emptyline: EmptyLineParser = line(i => isEmpty(i.source) ? [[], ''] : undefined);
-export const contentline: ContentLineParser = line(i => !isEmpty(i.source) ? [[], ''] : undefined);
+export const emptyline: EmptyLineParser = line(i => isBlank(i.source) ? [[], ''] : undefined);
+export const contentline: ContentLineParser = line(i => !isBlank(i.source) ? [[], ''] : undefined);

package/src/parser/source/str.ts

@@ -31,7 +31,7 @@ export function stropt(pattern: string | RegExp): Parser<string, Context<StrPars
         if (source === '') return;
         return source.slice(0, pattern.length) === pattern
           ? [[pattern], source.slice(pattern.length)]
-          : undefined;
+          : [[''], source];
       })
     : creation(1, false, ({ source }) => {
         if (source === '') return;

package/src/parser/util.ts

@@ -1,3 +1,13 @@
+import { Parser } from '../combinator/data/parser';
+import { convert } from '../combinator';
+
+export function format<P extends Parser<HTMLElement | string>>(parser: P): P;
+export function format<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
+  return convert(
+    source => source.replace(/(?<=^!?)https?:\/\/(?:[[]|[^\p{C}\p{S}\p{P}\s])\S*(?=[^\S\n]*(?:$|\n))/gm, '{ $& }'),
+    parser);
+}
+
 export function stringify(nodes: readonly (HTMLElement | string)[]): string {
   let acc = '';
   for (let i = 0; i < nodes.length; ++i) {

package/src/parser/visibility.ts

@@ -4,6 +4,7 @@ import { union, some, verify, convert, fmap } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { linebreak, unescsource } from './source';
 import { State } from './context';
+import { format } from './util';
 import { invisibleHTMLEntityNames } from './api/normalize';
 import { reduce } from 'spica/memoize';
 import { push } from 'spica/array';
@@ -16,7 +17,7 @@ export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Pa
   return union([
     convert(
       source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')),
-      verify(parser, (ns, rest, context) => !rest && hasVisible(ns, context))),
+      verify(format(parser), (ns, rest, context) => !rest && hasVisible(ns, context))),
     some(union([linebreak, unescsource])),
   ]);
 }

package/src/util/quote.ts

@@ -1,6 +1,6 @@
 import { exec } from '../combinator/data/parser';
 import { cite } from '../parser/block/reply/cite';
-import { define } from 'typed-dom/dom';
+//import { url } from '../parser/inline/autolink/url';
 
 export function quote(anchor: string, range: Range): string {
   if (exec(cite({ source: `>>${anchor}`, context: {} })) !== '') throw new Error(`Invalid anchor: ${anchor}`);
@@ -13,8 +13,15 @@ export function quote(anchor: string, range: Range): string {
     switch (true) {
       case el.matches('code'):
       case el.matches('.math'):
-        define(el, el.getAttribute('data-src')!);
+        el.replaceWith(el.getAttribute('data-src')!);
         continue;
+      //case el.matches('.url'):
+      //  if (exec(url({ source: el.getAttribute('href')!, context: {} })) === '') continue;
+      //  el.replaceWith(
+      //    /[\s{}]/.test(el.getAttribute('href')!)
+      //      ? `{ ${el.getAttribute('href')} }`
+      //      : `{${el.getAttribute('href')}}`);
+      //  continue;
       case el.matches('.media'):
         el.replaceWith(
           /[\s{}]/.test(el.getAttribute('data-src')!)