securemark 0.276.1 → 0.276.3

package/src/parser/processor/note.ts

@@ -1,5 +1,6 @@
 import { identity, signature, text } from '../inline/extension/indexee';
 import { markInvalid, unmarkInvalid } from '../util';
+import { memoize } from 'spica/memoize';
 import { html, define } from 'typed-dom/dom';
 
 export function* note(
@@ -26,12 +27,38 @@ export const reference = build('reference', (n, abbr) => `[${abbr || n}]`);
 
 function build(
   syntax: 'annotation' | 'reference',
-  marker: (index: number, abbr: string | undefined) => string,
+  marker: (index: number, abbr: string) => string,
   splitter: string = '',
 ) {
   assert(syntax.match(/^[a-z]+$/));
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
   // 構文ごとに各1回の処理では不可能
+  const memory = memoize((ref: HTMLElement): {
+    readonly content: Element;
+    readonly identifier: string;
+    readonly abbr: string;
+    readonly text: string;
+  } => {
+    const content = ref.firstElementChild!;
+    content.replaceWith(content.cloneNode());
+    const abbr = ref.getAttribute('data-abbr') ?? '';
+    const identifier = abbr
+      ? identity(
+          undefined,
+          (
+            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
+          ),
+          '')?.slice(2) || ''
+      : identity(undefined, signature(content), 'mark')?.slice(6) || '';
+    return {
+      content,
+      identifier,
+      abbr,
+      text: text(content).trim(),
+    };
+  }, new WeakMap());
   return function* (
     target: ParentNode & Node,
     note?: HTMLOListElement,
@@ -51,7 +78,7 @@ function build(
     let refIndex = 0;
     for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
-      if (ref.closest('sup > [hidden]')) {
+      if (!target.contains(ref)) {
         yield;
         continue;
       }
@@ -69,17 +96,7 @@ function build(
           yield;
         }
       }
-      const abbr = ref.getAttribute('data-abbr') || undefined;
-      const identifier = abbr
-        ? identity(
-            undefined,
-            (
-              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
-            ),
-            '')?.slice(2) || ''
-        : identity(undefined, signature(ref.firstElementChild!), 'mark')?.slice(6) || '';
+      const { content, identifier, abbr, text } = memory(ref);
       const refSubindex = refSubindexes.get(identifier)! + 1 || 1;
       refSubindexes.set(identifier, refSubindex);
       const refId = opts.id !== ''
@@ -99,7 +116,7 @@ function build(
               id: defId,
               'data-marker': note ? undefined : marker(total + defs.size + 1, abbr),
             },
-            [define(ref.firstElementChild!.cloneNode(true), { hidden: null }), html('sup')])
+            [content.cloneNode(true), html('sup')])
         : defs.get(identifier)!;
       initial && defs.set(identifier, def);
       assert(def.lastElementChild?.matches('sup'));
@@ -107,14 +124,10 @@ function build(
         ? total + defs.size
         : defIndexes.get(def)!;
       initial && defIndexes.set(def, defIndex);
-      const title = initial
-        ? text(ref.firstElementChild!).trim()
-        : titles.get(identifier)!;
+      const title = initial ? text : titles.get(identifier)!;
       initial && titles.set(identifier, title);
       assert(syntax !== 'annotation' || title);
-      ref.firstElementChild!.hasAttribute('hidden')
-        ? ref.lastElementChild!.remove()
-        : ref.firstElementChild!.setAttribute('hidden', '');
+      ref.childElementCount > 1 && ref.lastElementChild!.remove();
       define(ref, {
         id: refId,
         class: opts.id !== '' ? undefined : void ref.classList.add('disabled'),
@@ -140,7 +153,7 @@ function build(
         html('a',
           {
             href: refId && `#${refId}`,
-            title: abbr && (initial ? title : text(ref.firstElementChild!).trim()) || undefined,
+            title: abbr && text || undefined,
           },
           `^${++refIndex}`));
     }

package/src/parser/visibility.ts

@@ -167,23 +167,23 @@ function trimBlankEnd<T extends HTMLElement | string>(parser: Parser<T>): Parser
     parser,
     trimNodeEnd);
 }
-export function trimNode<T extends HTMLElement | string>(nodes: T[]): T[] {
-  return trimNodeStart(trimNodeEnd(nodes));
-}
-function trimNodeStart<T extends HTMLElement | string>(nodes: T[]): T[] {
-  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
-    if (nodes.length === 1 && typeof node === 'object' && node.className === 'indexer') break;
-    if (typeof node === 'string') {
-      const pos = node.trimStart().length;
-      if (pos > 0) {
-        nodes[0] = node.slice(-pos) as T;
-        break;
-      }
-    }
-    nodes.shift();
-  }
-  return nodes;
-}
+//export function trimNode<T extends HTMLElement | string>(nodes: T[]): T[] {
+//  return trimNodeStart(trimNodeEnd(nodes));
+//}
+//function trimNodeStart<T extends HTMLElement | string>(nodes: T[]): T[] {
+//  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
+//    if (nodes.length === 1 && typeof node === 'object' && node.className === 'indexer') break;
+//    if (typeof node === 'string') {
+//      const pos = node.trimStart().length;
+//      if (pos > 0) {
+//        nodes[0] = node.slice(-pos) as T;
+//        break;
+//      }
+//    }
+//    nodes.shift();
+//  }
+//  return nodes;
+//}
 export function trimNodeEnd<T extends HTMLElement | string>(nodes: T[]): T[] {
   const skip = nodes.length > 0 &&
     typeof nodes[nodes.length - 1] === 'object' &&

package/webpack.config.js

@@ -81,7 +81,7 @@ module.exports = env => {
       return merge(config);
     case 'lint':
       return merge(config, {
-        entry: glob.sync('./!(node_modules)/**/*.ts', { absolute: true }),
+        entry: glob.sync('./!(node_modules)/**/*.ts', { absolute: true }).sort(),
         plugins: [
           new ESLintPlugin({
             extensions: ['ts'],
@@ -109,7 +109,7 @@ module.exports = env => {
       });
     case 'dist':
       return merge(config, {
-        entry: glob.sync('./index.ts', { absolute: true }),
+        entry: glob.sync('./index.ts', { absolute: true }).sort(),
         module: {
           rules: [
             {