securemark 0.270.2 → 0.272.0

package/src/parser/inline/extension/indexee.ts

@@ -1,14 +1,15 @@
 import { MarkdownParser } from '../../../../markdown';
 import { Parser } from '../../../combinator/data/parser';
 import { fmap } from '../../../combinator';
+import { reduce } from 'spica/memoize';
 import { define } from 'typed-dom/dom';
 
 export function indexee<P extends Parser<unknown, MarkdownParser.Context>>(parser: P, optional?: boolean): P;
 export function indexee(parser: Parser<HTMLElement, MarkdownParser.Context>, optional?: boolean): Parser<HTMLElement> {
-  return fmap(parser, ([el], _, { id }) => [define(el, { id: identity(id, text(el, optional)) })]);
+  return fmap(parser, ([el], _, { id }) => [define(el, { id: identity(id, index(el, optional)) })]);
 }
 
-export function identity(id: string | undefined, text: string, name: 'index' | 'mark' | 'note' = 'index'): string | undefined {
+export function identity(id: string | undefined, text: string, name: 'index' | 'mark' = 'index'): string | undefined {
   assert(!id?.match(/[^0-9a-z/-]/i));
   assert(!text.includes('\n'));
   if (id === '') return undefined;
@@ -20,7 +21,6 @@ export function identity(id: string | undefined, text: string, name: 'index' | '
     case 'index':
       return `${name}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
     case 'mark':
-    case 'note':
       return `${name}:${id ?? ''}:${cs.slice(0, 50).join('')}...${cs.slice(-47).join('')}`;
   }
   assert(false);
@@ -32,7 +32,7 @@ assert(identity(undefined, '0'.repeat(100 - 1) + 1, 'mark')!.slice(6) === '0'.re
 assert(identity(undefined, '0'.repeat(100) + 1, 'mark')!.slice(6) === '0'.repeat(50) + '...' + '0'.repeat(47 - 1) + 1);
 assert(identity(undefined, '0'.repeat(200) + 1, 'mark')!.slice(6) === '0'.repeat(50) + '...' + '0'.repeat(47 - 1) + 1);
 
-export function text(source: Element | DocumentFragment, optional = false): string {
+export function index(source: Element | DocumentFragment, optional = false): string {
   assert(source instanceof DocumentFragment || !source.matches('.indexer'));
   assert(source.querySelectorAll(':scope > .indexer').length <= 1);
   if (!source.firstChild) return '';
@@ -40,6 +40,10 @@ export function text(source: Element | DocumentFragment, optional = false): stri
   const index = indexer?.getAttribute('data-index');
   if (index) return index;
   if (index === '' && optional) return '';
+  return text(source);
+}
+
+export const text = reduce((source: Element | DocumentFragment): string => {
   assert(!navigator.userAgent.includes('Chrome') || !source.querySelector('br:not(:has(+ :is(ul, ol)))'));
   const target = source.cloneNode(true) as typeof source;
   for (let es = target.querySelectorAll('code[data-src], .math[data-src], .comment, rt, rp, br, .annotation, .reference, .checkbox, ul, ol'),
@@ -72,4 +76,4 @@ export function text(source: Element | DocumentFragment, optional = false): stri
   // Better:
   //return target.innerText;
   return target.textContent!;
-}
+});

package/src/parser/inline/media.ts

@@ -73,11 +73,11 @@ const bracket: MediaParser.TextParser.BracketParser = lazy(() => creation(union(
   surround(str('"'), precedence(8, some(union([unsafehtmlentity, txt]), '"')), str('"'), true),
 ])));
 
-const option: MediaParser.ParameterParser.OptionParser = union([
+const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([
   fmap(str(/^[^\S\n]+[1-9][0-9]*x[1-9][0-9]*(?=[^\S\n]|})/), ([opt]) => [` width="${opt.slice(1).split('x')[0]}"`, ` height="${opt.slice(1).split('x')[1]}"`]),
   fmap(str(/^[^\S\n]+[1-9][0-9]*:[1-9][0-9]*(?=[^\S\n]|})/), ([opt]) => [` aspect-ratio="${opt.slice(1).split(':').join('/')}"`]),
   linkoption,
-]);
+]));
 
 function sanitize(target: HTMLElement, uri: ReadonlyURL, alt: string): boolean {
   assert(target.tagName === 'IMG');

package/src/parser/inline.ts

@@ -1,5 +1,5 @@
 import { MarkdownParser } from '../../markdown';
-import { union } from '../combinator';
+import { union, lazy } from '../combinator';
 import { annotation } from './inline/annotation';
 import { reference } from './inline/reference';
 import { template } from './inline/template';
@@ -45,7 +45,7 @@ export import ShortMediaParser = InlineParser.ShortMediaParser;
 export import AutolinkParser = InlineParser.AutolinkParser;
 export import BracketParser = InlineParser.BracketParser;
 
-export const inline: InlineParser = union([
+export const inline: InlineParser = lazy(() => union([
   annotation,
   reference,
   template,
@@ -68,7 +68,7 @@ export const inline: InlineParser = union([
   autolink,
   bracket,
   text
-]);
+]));
 
 export { indexee } from './inline/extension/indexee';
 export { indexer } from './inline/extension/indexer';

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

@@ -29,15 +29,15 @@ describe('Unit: parser/processor/footnote', () => {
             html('p', [
               html('sup', { class: "annotation", id: "annotation::ref:1", title: "a b" }, [
                 html('span', { hidden: '' }, 'a b'),
-                html('a', { href: "#annotation::def:1" }, '*1')
+                html('a', { href: "#annotation::def:a_b" }, '*1')
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
           footnote.outerHTML,
           html('ol', [
-            html('li', { id: 'annotation::def:1' }, [
-              html('span', { id: 'note::a_b' }, 'a b'),
+            html('li', { id: 'annotation::def:a_b' }, [
+              html('span', 'a b'),
               html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')])
             ]),
           ]).outerHTML);
@@ -59,7 +59,7 @@ describe('Unit: parser/processor/footnote', () => {
               ]),
               html('sup', { class: "annotation", id: "annotation::ref:2", title: "12345678901234567890" }, [
                 html('span', { hidden: '' }, '12345678901234567890'),
-                html('a', { href: "#annotation::def:2" }, '*2')
+                html('a', { href: "#annotation::def:12345678901234567890" }, '*2')
               ]),
             ]).outerHTML,
           ]);
@@ -67,11 +67,11 @@ describe('Unit: parser/processor/footnote', () => {
           footnote.outerHTML,
           html('ol', [
             html('li', { id: 'annotation::def:1' }, [
-              html('span', { id: 'note::1' }, '1'),
+              html('span', '1'),
               html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')])
             ]),
-            html('li', { id: 'annotation::def:2' }, [
-              html('span', { id: 'note::12345678901234567890' }, '12345678901234567890'),
+            html('li', { id: 'annotation::def:12345678901234567890' }, [
+              html('span', '12345678901234567890'),
               html('sup', [html('a', { href: '#annotation::ref:2' }, '^2')])
             ]),
           ]).outerHTML);
@@ -113,22 +113,22 @@ describe('Unit: parser/processor/footnote', () => {
           footnote.outerHTML,
           html('ol', [
             html('li', { id: 'annotation::def:1' }, [
-              html('span', { id: 'note::1' }, '1'),
+              html('span', '1'),
               html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')])
             ]),
             html('li', { id: 'annotation::def:2' }, [
-              html('span', { id: 'note::2' }, '2'),
+              html('span', '2'),
               html('sup', [
                 html('a', { href: '#annotation::ref:2' }, '^2'),
                 html('a', { href: '#annotation::ref:4' }, '^4'),
               ]),
             ]),
             html('li', { id: 'annotation::def:3' }, [
-              html('span', { id: 'note::3' }, '3'),
+              html('span', '3'),
               html('sup', [html('a', { href: '#annotation::ref:3' }, '^3')])
             ]),
             html('li', { id: 'annotation::def:4' }, [
-              html('span', { id: 'note::4' }, '4'),
+              html('span', '4'),
               html('sup', [html('a', { href: '#annotation::ref:5' }, '^5')])
             ]),
           ]).outerHTML);
@@ -141,9 +141,9 @@ describe('Unit: parser/processor/footnote', () => {
 
     it('separation', () => {
       const target = html('blockquote', parse([
-        '!>> ((a))\n> ((a))\n~~~',
-        '~~~~example/markdown\n((a))\n~~~~',
-        '((a))',
+        '!>> ((1))\n> ((2))\n~~~',
+        '~~~~example/markdown\n((3))\n~~~~',
+        '((4))',
       ].join('\n\n')).children);
       const footnote = html('ol');
       for (let i = 0; i < 3; ++i) {
@@ -151,13 +151,13 @@ describe('Unit: parser/processor/footnote', () => {
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
-            '<blockquote><blockquote><section><p><sup class="annotation disabled" title="a"><span hidden="">a</span><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>a</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote><section><p><sup class="annotation disabled" title="a"><span hidden="">a</span><a>*1</a></sup><br>~~~</p><ol class="annotations"><li data-marker="*1"><span>a</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote>',
-            '<aside class="example" data-type="markdown"><pre translate="no">((a))</pre><hr><section><p><sup class="annotation disabled" title="a"><span hidden="">a</span><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>a</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></aside>',
-            '<p><sup class="annotation" id="annotation::ref:1" title="a"><span hidden="">a</span><a href="#annotation::def:1">*1</a></sup></p>',
+            '<blockquote><blockquote><section><p><sup class="annotation disabled" title="1"><span hidden="">1</span><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>1</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote><section><p><sup class="annotation disabled" title="2"><span hidden="">2</span><a>*1</a></sup><br>~~~</p><ol class="annotations"><li data-marker="*1"><span>2</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote>',
+            '<aside class="example" data-type="markdown"><pre translate="no">((3))</pre><hr><section><p><sup class="annotation disabled" title="3"><span hidden="">3</span><a>*1</a></sup></p><ol class="annotations"><li data-marker="*1"><span>3</span><sup><a>^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></aside>',
+            '<p><sup class="annotation" id="annotation::ref:1" title="4"><span hidden="">4</span><a href="#annotation::def:4">*1</a></sup></p>',
           ]);
         assert.deepStrictEqual(
           footnote.outerHTML,
-          '<ol><li id="annotation::def:1"><span id="note::a">a</span><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>');
+          '<ol><li id="annotation::def:4"><span>4</span><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>');
       }
     });
 
@@ -172,15 +172,15 @@ describe('Unit: parser/processor/footnote', () => {
             html('p', [
               html('sup', { class: "annotation", id: "annotation:0:ref:1", title: "a b" }, [
                 html('span', { hidden: '' }, 'a b'),
-                html('a', { href: "#annotation:0:def:1" }, '*1')
+                html('a', { href: "#annotation:0:def:a_b" }, '*1')
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
           footnote.outerHTML,
           html('ol', [
-            html('li', { id: 'annotation:0:def:1' }, [
-              html('span', { id: 'note:0:a_b' }, 'a b'),
+            html('li', { id: 'annotation:0:def:a_b' }, [
+              html('span', 'a b'),
               html('sup', [html('a', { href: '#annotation:0:ref:1' }, '^1')])
             ]),
           ]).outerHTML);
@@ -202,7 +202,7 @@ describe('Unit: parser/processor/footnote', () => {
             ]).outerHTML,
             html('ol', { class: 'annotations' }, [
               html('li', { id: 'annotation::def:1', 'data-marker': '*1' }, [
-                html('span', { id: 'note::1' }, '1'),
+                html('span', '1'),
                 html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')])
               ]),
             ]).outerHTML,
@@ -220,11 +220,11 @@ describe('Unit: parser/processor/footnote', () => {
             ]).outerHTML,
             html('ol', { class: 'annotations' }, [
               html('li', { id: 'annotation::def:2', 'data-marker': '*2' }, [
-                html('span', { id: 'note::2' }, '2'),
+                html('span', '2'),
                 html('sup', [html('a', { href: '#annotation::ref:2' }, '^2')])
               ]),
               html('li', { id: 'annotation::def:3', 'data-marker': '*3' }, [
-                html('span', { id: 'note::3' }, '3'),
+                html('span', '3'),
                 html('sup', [html('a', { href: '#annotation::ref:3' }, '^3')])
               ]),
             ]).outerHTML,
@@ -237,7 +237,7 @@ describe('Unit: parser/processor/footnote', () => {
             ]).outerHTML,
             html('ol', { class: 'annotations' }, [
               html('li', { id: 'annotation::def:4', 'data-marker': '*4' }, [
-                html('span', { id: 'note::4' }, '4'),
+                html('span', '4'),
                 html('sup', [html('a', { href: '#annotation::ref:4' }, '^4')])
               ]),
             ]).outerHTML,
@@ -259,15 +259,15 @@ describe('Unit: parser/processor/footnote', () => {
             html('p', [
               html('sup', { class: "reference", id: "reference::ref:1", title: "a b" }, [
                 html('span', { hidden: '' }, 'a b'),
-                html('a', { href: "#reference::def:1" }, '[1]')
+                html('a', { href: "#reference::def:a_b" }, '[1]')
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
           footnote.outerHTML,
           html('ol', [
-            html('li', { id: 'reference::def:1' }, [
-              html('span', { id: 'note::a_b' }, 'a b'),
+            html('li', { id: 'reference::def:a_b' }, [
+              html('span', 'a b'),
               html('sup', [html('a', { href: '#reference::ref:1' }, '^1')])
             ]),
           ]).outerHTML);
@@ -275,7 +275,7 @@ describe('Unit: parser/processor/footnote', () => {
     });
 
     it('abbr', () => {
-      const target = parse('[[^a]][[^a| b]][[^a]]');
+      const target = parse('[[^a| b]][[^a]][[^a]]');
       const footnote = html('ol');
       for (let i = 0; i < 3; ++i) {
         [...reference(target, footnote)];
@@ -284,27 +284,27 @@ describe('Unit: parser/processor/footnote', () => {
           [
             html('p', [
               html('sup', { class: "reference", 'data-abbr': "a", id: "reference::ref:1", title: "b" }, [
-                html('span', { hidden: '' }),
-                html('a', { href: "#reference::def:1" }, '[a]')
+                html('span', { hidden: '' }, 'b'),
+                html('a', { href: "#reference::def:a" }, '[a]')
               ]),
               html('sup', { class: "reference", 'data-abbr': "a", id: "reference::ref:2", title: "b" }, [
-                html('span', { hidden: '' }, 'b'),
-                html('a', { href: "#reference::def:1" }, '[a]')
+                html('span', { hidden: '' }),
+                html('a', { href: "#reference::def:a" }, '[a]')
               ]),
               html('sup', { class: "reference", 'data-abbr': "a", id: "reference::ref:3", title: "b" }, [
                 html('span', { hidden: '' }),
-                html('a', { href: "#reference::def:1" }, '[a]')
+                html('a', { href: "#reference::def:a" }, '[a]')
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
           footnote.outerHTML,
           html('ol', [
-            html('li', { id: 'reference::def:1' }, [
-              html('span', { id: 'note::b' }, 'b'),
+            html('li', { id: 'reference::def:a' }, [
+              html('span', 'b'),
               html('sup', [
-                html('a', { href: '#reference::ref:1' }, '^1'),
-                html('a', { href: '#reference::ref:2', title: 'b' }, '^2'),
+                html('a', { href: '#reference::ref:1', title: 'b' }, '^1'),
+                html('a', { href: '#reference::ref:2' }, '^2'),
                 html('a', { href: '#reference::ref:3' }, '^3'),
               ])
             ]),

package/src/parser/processor/footnote.ts

@@ -12,8 +12,8 @@ export function* footnote(
     const el = es[i];
     el.parentNode === target && el.remove();
   }
-  yield* reference(target, footnotes?.references, opts, bottom);
   yield* annotation(target, footnotes?.annotations, opts, bottom);
+  yield* reference(target, footnotes?.references, opts, bottom);
   return;
 }
 
@@ -44,25 +44,16 @@ function build(
     }
     const refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`);
     const titles = new Map<string, string>();
-    const contents = new Map<string, HTMLSpanElement>();
-    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 = html('span',
-        { id: identity(opts.id, text(ref.firstElementChild!), 'note') },
-        ref.firstElementChild!.cloneNode(true).childNodes);
-      const title = text(content).trim();
-      if (!title) continue;
-      titles.set(identifier, title);
-      contents.set(identifier, content);
-    }
+    const indexes = new Map<HTMLLIElement, number>();
     let count = 0;
     let total = 0;
     let style: 'count' | 'abbr';
     for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
+      if (ref.closest('[hidden]')) {
+        yield;
+        continue;
+      }
       while (splitters.length > 0
           && splitters[0].compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING) {
         if (defs.size > 0) {
@@ -74,8 +65,13 @@ function build(
         }
         splitters.shift();
       }
-      const identifier = ref.getAttribute('data-abbr') || ` ${ref.firstElementChild!.innerHTML}`;
       const abbr = ref.getAttribute('data-abbr') || undefined;
+      const identifier = abbr || identity(undefined, text(ref.firstElementChild!), 'mark')?.slice(6) || '';
+      const title = undefined
+        || titles.get(identifier)
+        || titles.set(identifier, text(ref.firstElementChild!)).get(identifier)!
+        || null;
+      assert(syntax !== 'annotation' || title);
       style ??= abbr ? 'abbr' : 'count';
       if (style === 'count' ? abbr : !abbr) {
         define(ref, {
@@ -99,9 +95,6 @@ function build(
       else {
         ref.lastChild?.remove();
       }
-      const title = titles.get(identifier);
-      assert(title !== '');
-      assert(syntax !== 'annotation' || title);
       const refIndex = ++count;
       const refId = opts.id !== ''
         ? `${syntax}:${opts.id ?? ''}:ref:${refIndex}`
@@ -110,24 +103,26 @@ function build(
         || defs.get(identifier)
         || defs.set(identifier, html('li',
             {
-              id: opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${total + defs.size + 1}` : undefined,
+              id: opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}` : undefined,
               'data-marker': !footnote ? marker(total + defs.size + 1, abbr) : undefined,
             },
-            [contents.get(identifier) ?? frag(), html('sup')]))
+            [define(ref.firstElementChild!.cloneNode(true), { hidden: null }), html('sup')]))
             .get(identifier)!;
       assert(def.lastChild);
-      const defIndex = +def.id.slice(def.id.lastIndexOf(':') + 1) || total + defs.size;
+      const defIndex = undefined
+        || indexes.get(def)
+        || indexes.set(def, total + defs.size).get(def)!;
       const defId = def.id || undefined;
       define(ref, {
         id: refId,
-        class: opts.id !== '' ? undefined : `${ref.className} disabled`,
-        ...title
-          ? { title }
-          : { class: void ref.classList.add('invalid'),
-              'data-invalid-syntax': syntax,
-              'data-invalid-type': 'content',
-              'data-invalid-message': 'Missing the content',
-            },
+        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',
+        },
       });
       yield ref.appendChild(html('a', { href: refId && defId && `#${defId}` }, marker(defIndex, abbr)));
       assert(ref.title || ref.matches('.invalid'));

package/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "ES2021",
     "lib": [
-      "ES2021",
+      "ES2022",
       "DOM",
       "DOM.Iterable"
     ],
@@ -18,6 +18,7 @@
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
     "suppressImplicitAnyIndexErrors": true,
+    "ignoreDeprecations": "5.0",
     "noFallthroughCasesInSwitch": true,
     "noErrorTruncation": true,
     "forceConsistentCasingInFileNames": true

package/webpack.config.js

@@ -33,7 +33,7 @@ module.exports = env => {
     resolve: {
       extensions: ['.ts', '.js'],
     },
-    entry: glob.sync('./{src,test}/**/*.ts'),
+    entry: glob.sync('./{src,test}/**/*.ts', { absolute: true }).sort(),
     output: {
       filename: 'index.js',
       path: path.resolve(__dirname, 'dist'),
@@ -81,7 +81,7 @@ module.exports = env => {
       return merge(config);
     case 'lint':
       return merge(config, {
-        entry: glob.sync('./!(node_modules)/**/*.ts'),
+        entry: glob.sync('./!(node_modules)/**/*.ts', { absolute: true }),
         plugins: [
           new ESLintPlugin({
             extensions: ['ts'],
@@ -90,7 +90,7 @@ module.exports = env => {
       });
     case 'bench':
       return merge(config, {
-        entry: glob.sync('./benchmark/**/*.ts'),
+        entry: glob.sync('./benchmark/**/*.ts', { absolute: true }).sort(),
         module: {
           rules: [
             {
@@ -109,7 +109,7 @@ module.exports = env => {
       });
     case 'dist':
       return merge(config, {
-        entry: glob.sync('./index.ts'),
+        entry: glob.sync('./index.ts', { absolute: true }),
         module: {
           rules: [
             {