securemark 0.274.1 → 0.274.3

package/src/parser/processor/note.ts

@@ -1,9 +1,13 @@
 import { identity, text } from '../inline/extension/indexee';
+import { markInvalid, unmarkInvalid } from '../util';
 import { frag, html, define } from 'typed-dom/dom';
 
 export function* note(
   target: ParentNode & Node,
-  notes?: { readonly annotations?: HTMLOListElement; readonly references: HTMLOListElement; },
+  notes?: {
+    readonly annotations?: HTMLOListElement;
+    readonly references: HTMLOListElement;
+  },
   opts: { readonly id?: string; } = {},
   bottom: Node | null = null,
 ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
@@ -35,40 +39,46 @@ function build(
     bottom: Node | null = null,
   ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
     const defs = new Map<string, HTMLLIElement>();
-    const splitters: Element[] = [];
-    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 defIndexes = new Map<HTMLLIElement, number>();
     const refSubindexes = new Map<string, number>();
-    const defSubindexes = new Map<string, number>();
-    let refIndex = 0;
+    const defSubindexes = splitter && refs.length > 0 ? new Map<string, number>() : undefined;
+    const splitters = splitter && refs.length > 0 ? target.querySelectorAll(splitter) : [];
+    let iSplitters = 0;
     let total = 0;
-    let style: 'count' | 'abbr';
+    let format: 'number' | 'abbr';
+    let refIndex = 0;
     for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
-      if (ref.closest('[hidden]')) {
+      if (ref.closest('sup > [hidden]')) {
         yield;
         continue;
       }
-      while (splitters.length > 0
-          && splitters[0].compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING) {
+      if (splitter) for (
+        let el: Element;
+        (el = splitters[iSplitters])?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING;
+        ++iSplitters) {
+        if (el.parentNode !== target) continue;
         if (defs.size > 0) {
           total += defs.size;
-          yield* proc(defs, target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[0]));
+          yield* proc(defs, target.insertBefore(html('ol', { class: `${syntax}s` }), el));
+          assert(defs.size === 0);
         }
-        else if (splitters.length % 100 === 0) {
+        else if (~iSplitters % 128 === 0) {
           yield;
         }
-        splitters.shift();
       }
       const abbr = ref.getAttribute('data-abbr') || undefined;
-      const identifier = abbr || identity(undefined, text(ref.firstElementChild!), 'mark')?.slice(6) || '';
+      const identifier = identity(
+        undefined,
+        abbr
+          ? abbr.match(/^(?:\S+ )+?(?:(?:January|February|March|April|May|June|August|September|October|November|December) \d{1,2}(?:-\d{0,2})?, \d{1,4}(?:-\d{0,4})?[a-z]?|n\.d\.)(?=,|$)/)?.[0] ??
+            abbr.match(/^[^,\s]+(?:,? [^,\s]+)*?(?: \d{1,4}(?:-\d{0,4})?[a-z]?(?=,|$)|(?=,(?: [a-z]+\.?)? [0-9]))/)?.[0] ??
+            abbr
+          : text(ref.firstElementChild!),
+        'mark')
+        ?.slice(6) || '';
       const refSubindex = refSubindexes.get(identifier)! + 1 || 1;
       refSubindexes.set(identifier, refSubindex);
       const refId = opts.id !== ''
@@ -77,65 +87,55 @@ function build(
       const initial = splitter
         ? !defs.has(identifier)
         : refSubindex === 1;
-      const defSubindex = defSubindexes.get(identifier)! + 1 || 1;
-      defSubindexes.set(identifier, defSubindex);
+      const defSubindex = defSubindexes?.get(identifier)! + +initial || 1;
+      initial && defSubindexes?.set(identifier, defSubindex);
+      const defId = opts.id !== ''
+        ? `${syntax}:${opts.id ?? ''}:def:${identifier}${splitter && `:${defSubindex}`}`
+        : undefined;
       const def = initial
         ? html('li',
             {
-              id: opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}:${defSubindex}` : undefined,
-              'data-marker': !note ? marker(total + defs.size + 1, abbr) : undefined,
+              id: defId,
+              'data-marker': note ? undefined : marker(total + defs.size + 1, abbr),
             },
             [define(ref.firstElementChild!.cloneNode(true), { hidden: null }), html('sup')])
         : defs.get(identifier)!;
       initial && defs.set(identifier, def);
-      assert(def.lastChild);
+      assert(def.lastElementChild?.matches('sup'));
       const defIndex = initial
         ? total + defs.size
         : defIndexes.get(def)!;
       initial && defIndexes.set(def, defIndex);
-      const defId = def.id || undefined;
       const title = initial
         ? text(ref.firstElementChild!)
         : titles.get(identifier)!;
       initial && titles.set(identifier, title);
       assert(syntax !== 'annotation' || title);
-      style ??= abbr ? 'abbr' : 'count';
-      if (style === 'count' ? abbr : !abbr) {
-        define(ref, {
-          class: void ref.classList.add('invalid'),
-          'data-invalid-syntax': syntax,
-          'data-invalid-type': 'style',
-          'data-invalid-message': `${syntax[0].toUpperCase() + syntax.slice(1)} style must be consistent`,
-        });
-      }
-      else if (ref.getAttribute('data-invalid-type') === 'style') {
-        define(ref, {
-          class: void ref.classList.remove('invalid'),
-          'data-invalid-syntax': null,
-          'data-invalid-type': null,
-          'data-invalid-message': null,
-        });
-      }
-      if (!ref.firstElementChild!.hasAttribute('hidden')) {
-        ref.firstElementChild!.setAttribute('hidden', '');
-      }
-      else {
-        ref.lastChild?.remove();
-      }
+      ref.firstElementChild!.hasAttribute('hidden')
+        ? ref.lastElementChild!.remove()
+        : ref.firstElementChild!.setAttribute('hidden', '');
       define(ref, {
         id: refId,
         class: opts.id !== '' ? undefined : void ref.classList.add('disabled'),
         title,
-        ...!title && {
-          class: void ref.classList.add('invalid'),
-          'data-invalid-syntax': syntax,
-          'data-invalid-type': 'content',
-          'data-invalid-message': 'Missing the content',
-        },
       });
+      switch (ref.getAttribute('data-invalid-syntax')) {
+        case 'format':
+        case 'content':
+          unmarkInvalid(ref);
+      }
+      format ??= abbr ? 'abbr' : 'number';
+      if (!ref.classList.contains('invalid')) switch (true) {
+        case format === 'number' ? !!abbr : !abbr:
+          markInvalid(ref, syntax, 'format', 'Notation format must be consistent with numbers or abbreviations');
+          break;
+        case !title:
+          markInvalid(ref, syntax, 'content', 'Missing the content');
+          break;
+      }
       yield ref.appendChild(html('a', { href: refId && defId && `#${defId}` }, marker(defIndex, abbr)));
       assert(ref.title || ref.matches('.invalid'));
-      def.lastChild!.appendChild(
+      def.lastElementChild!.appendChild(
         html('a',
           {
             href: refId && `#${refId}`,
@@ -143,8 +143,8 @@ function build(
           },
           `^${++refIndex}`));
     }
-    if (defs.size > 0 || note) {
-      yield* proc(defs, note ?? target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[0] ?? bottom));
+    if (note || defs.size > 0) {
+      yield* proc(defs, note ?? target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[iSplitters] ?? bottom));
     }
     return;
   }

package/src/parser/util.ts

@@ -1,3 +1,29 @@
+import { define } from 'typed-dom/dom';
+
+export function markInvalid<T extends Element>(
+  el: T,
+  syntax: string,
+  type: string,
+  message: string,
+): T {
+  assert(!message.endsWith('.'));
+  return define(el, {
+    class: void el.classList.add('invalid'),
+    'data-invalid-syntax': syntax,
+    'data-invalid-type': type,
+    'data-invalid-message': message,
+  });
+}
+
+export function unmarkInvalid<T extends Element>(el: T): T {
+  return define(el, {
+    class: void el.classList.remove('invalid'),
+    'data-invalid-syntax': null,
+    'data-invalid-type': null,
+    'data-invalid-message': null,
+  });
+}
+
 export function stringify(nodes: readonly (HTMLElement | string)[]): string {
   let acc = '';
   for (let i = 0; i < nodes.length; ++i) {