securemark 0.271.0 → 0.273.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.271.0",
+  "version": "0.273.0",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -28,35 +28,35 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@types/dompurify": "3.0.0",
+    "@types/dompurify": "3.0.2",
     "@types/jquery": "3.5.16",
     "@types/mathjax": "0.0.37",
     "@types/mocha": "10.0.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.55.0",
+    "@typescript-eslint/parser": "^5.59.0",
     "babel-loader": "^9.1.2",
     "babel-plugin-unassert": "^3.2.0",
-    "concurrently": "^7.6.0",
-    "eslint": "^8.36.0",
+    "concurrently": "^8.0.1",
+    "eslint": "^8.39.0",
     "eslint-plugin-redos": "^4.4.5",
-    "eslint-webpack-plugin": "^4.0.0",
-    "glob": "^8.1.0",
-    "karma": "^6.4.1",
-    "karma-chrome-launcher": "^3.1.1",
+    "eslint-webpack-plugin": "^4.0.1",
+    "glob": "^10.2.1",
+    "karma": "^6.4.2",
+    "karma-chrome-launcher": "^3.2.0",
     "karma-coverage": "^2.2.0",
     "karma-firefox-launcher": "^2.1.2",
     "karma-mocha": "^2.0.1",
     "karma-power-assert": "^1.0.0",
     "mocha": "^10.2.0",
-    "npm-check-updates": "^16.7.12",
-    "semver": "^7.3.8",
-    "spica": "0.0.719",
+    "npm-check-updates": "^16.10.9",
+    "semver": "^7.5.0",
+    "spica": "0.0.721",
     "ts-loader": "^9.4.2",
-    "typed-dom": "^0.0.317",
-    "typescript": "4.9.5",
-    "webpack": "^5.76.1",
-    "webpack-cli": "^5.0.1",
+    "typed-dom": "^0.0.330",
+    "typescript": "5.0.4",
+    "webpack": "^5.80.0",
+    "webpack-cli": "^5.0.2",
     "webpack-merge": "^5.8.0"
   },
   "scripts": {

package/src/parser/api/bind.test.ts

@@ -27,7 +27,7 @@ describe('Unit: parser/api/bind', () => {
       return acc;
     }
 
-    const cfgs = { footnotes: { references: html('ol') } };
+    const cfgs = { notes: { references: html('ol') } };
 
     it('huge input', () => {
       const iter = bind(html('div'), { ...cfgs, id: '' }).parse(`${'\n'.repeat(10 * 1000 ** 2)}`);
@@ -211,18 +211,18 @@ describe('Unit: parser/api/bind', () => {
           ]).outerHTML,
         ]);
       assert.deepStrictEqual(
-        cfgs.footnotes.references?.outerHTML,
+        cfgs.notes.references?.outerHTML,
         html('ol', [
           html('li', { id: 'reference::def:1' }, [
-            html('span', { id: 'note::1' }, '1'),
+            html('span', '1'),
             html('sup', [html('a', { href: '#reference::ref:1' }, '^1')]),
           ]),
           html('li', { id: 'reference::def:2' }, [
-            html('span', { id: 'note::2' }, '2'),
+            html('span', '2'),
             html('sup', [html('a', { href: '#reference::ref:2' }, '^2')]),
           ]),
           html('li', { id: 'reference::def:3' }, [
-            html('span', { id: 'note::3' }, '3'),
+            html('span', '3'),
             html('sup', [html('a', { href: '#reference::ref:3' }, '^3')]),
           ]),
         ]).outerHTML);

package/src/parser/api/bind.ts

@@ -9,7 +9,7 @@ import { State } from '../context';
 import { normalize } from './normalize';
 import { headers } from './header';
 import { figure } from '../processor/figure';
-import { footnote } from '../processor/footnote';
+import { note } from '../processor/note';
 import { ReadonlyURL } from 'spica/url';
 import { push, splice } from 'spica/array';
 
@@ -116,17 +116,17 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
       yield { type: 'block', value: el };
       if (rev !== revision) return yield { type: 'cancel' };
     }
-    for (const el of figure(next(0)?.parentNode ?? target, settings.footnotes, context)) {
+    for (const el of figure(next(0)?.parentNode ?? target, settings.notes, context)) {
       assert(rev === revision);
       el
         ? yield { type: 'figure', value: el }
         : yield { type: 'break' };
       if (rev !== revision) return yield { type: 'cancel' };
     }
-    for (const el of footnote(next(0)?.parentNode ?? target, settings.footnotes, context, bottom)) {
+    for (const el of note(next(0)?.parentNode ?? target, settings.notes, context, bottom)) {
       assert(rev === revision);
       el
-        ? yield { type: 'footnote', value: el }
+        ? yield { type: 'note', value: el }
         : yield { type: 'break' };
       if (rev !== revision) return yield { type: 'cancel' };
     }

package/src/parser/api/parse.test.ts

@@ -124,7 +124,7 @@ describe('Unit: parser/api/parse', () => {
           '<p><a class="index" href="#index::a">a</a></p>',
           '<figure data-type="math" data-label="$-a" data-group="$" data-number="1" id="label:$-a"><figcaption><span class="figindex">(1)</span><span class="figtext"></span></figcaption><div><div class="math" translate="no">$$\n$$</div></div></figure>',
           '<p><a class="label" data-label="$-a" href="#label:$-a">(1)</a></p>',
-          '<p><sup class="annotation" id="annotation::ref:1" title="a"><span hidden="">a</span><a href="#annotation::def:1">*1</a></sup></p>',
+          '<p><sup class="annotation" id="annotation::ref:1" title="a"><span hidden="">a</span><a href="#annotation::def:a">*1</a></sup></p>',
           '<p><a class="url" href="https://source/x/a" target="_blank">a</a></p>',
           '<p><a class="url" href="https://source/a" target="_blank">/a</a></p>',
           '<p><a class="url" href="/z/a">^/a</a></p>',
@@ -135,7 +135,7 @@ describe('Unit: parser/api/parse', () => {
           '<p><a href="https://source/x/a" target="_blank"><img class="media" data-src="https://source/x/a" alt=""></a></p>',
           '<p><a href="/z/a" target="_blank"><img class="media" data-src="/z/a" alt=""></a></p>',
           '<p><a href="https://source/a" target="_blank"><img class="media" data-src="https://source/a" alt=""></a></p>',
-          '<ol class="annotations"><li id="annotation::def:1" data-marker="*1"><span id="note::a">a</span><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>',
+          '<ol class="annotations"><li id="annotation::def:a" data-marker="*1"><span>a</span><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(
         [...parse([
@@ -201,18 +201,18 @@ describe('Unit: parser/api/parse', () => {
         ]);
     });
 
-    it('footnote', () => {
-      const footnotes = { references: html('ol') };
+    it('note', () => {
+      const notes = { references: html('ol') };
       assert.deepStrictEqual(
-        [...parse('$-a\n$$\n$$\n\n(($-a[[b]][[c_d_]]))', { footnotes }).children].map(el => el.outerHTML),
+        [...parse('$-a\n$$\n$$\n\n(($-a[[^b]]))[[^b|$-a]]', { notes }).children].map(el => el.outerHTML),
         [
           '<figure data-type="math" data-label="$-a" data-group="$" data-number="1" id="label:$-a"><figcaption><span class="figindex">(1)</span><span class="figtext"></span></figcaption><div><div class="math" translate="no">$$\n$$</div></div></figure>',
-          '<p><sup class="annotation" id="annotation::ref:1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" id="reference::ref:1" title="b"><span hidden="">b</span><a href="#reference::def:1">[1]</a></sup><sup class="reference" id="reference::ref:2" title="cd"><span hidden="">c<em>d</em></span><a href="#reference::def:2">[2]</a></sup></span><a href="#annotation::def:1">*1</a></sup></p>',
-          '<ol class="annotations"><li id="annotation::def:1" data-marker="*1"><span id="note::(1)"><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" id="reference::ref:1" title="b"><span hidden="">b</span><a href="#reference::def:1">[1]</a></sup><sup class="reference" id="reference::ref:2" title="cd"><span hidden="">c<em>d</em></span><a href="#reference::def:2">[2]</a></sup></span><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>',
+          '<p><sup class="annotation" id="annotation::ref:1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="b"><span></span></sup></span><a href="#annotation::def:(1)">*1</a></sup><sup class="reference" data-abbr="b" id="reference::ref:1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><a href="#reference::def:b">[b]</a></sup></p>',
+          '<ol class="annotations"><li id="annotation::def:(1)" data-marker="*1"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="b" id="reference::ref:2" title="(1)"><span hidden=""></span><a href="#reference::def:b">[b]</a></sup></span><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(
-        footnotes.references.outerHTML,
-        '<ol><li id="reference::def:1"><span id="note::b">b</span><sup><a href="#reference::ref:1">^1</a></sup></li><li id="reference::def:2"><span id="note::cd">c<em>d</em></span><sup><a href="#reference::ref:2">^2</a></sup></li></ol>');
+        notes.references.outerHTML,
+        '<ol><li id="reference::def:b"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><sup><a href="#reference::ref:1" title="(1)">^1</a><a href="#reference::ref:2">^2</a></sup></li></ol>');
     });
 
     it('normalize', () => {

package/src/parser/api/parse.ts

@@ -9,7 +9,7 @@ import { State } from '../context';
 import { normalize } from './normalize';
 import { headers } from './header';
 import { figure } from '../processor/figure';
-import { footnote } from '../processor/footnote';
+import { note } from '../processor/note';
 import { ReadonlyURL } from 'spica/url';
 import { frag } from 'typed-dom/dom';
 
@@ -41,9 +41,9 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
   }
   assert(opts.id !== '' || !node.querySelector('[id], .index[href], .label[href], .annotation > a[href], .reference > a[href]'));
   if (opts.test) return node;
-  for (const _ of figure(node, opts.footnotes, context));
-  for (const _ of footnote(node, opts.footnotes, context));
+  for (const _ of figure(node, opts.notes, context));
+  for (const _ of note(node, opts.notes, context));
   assert(opts.id !== '' || !node.querySelector('[id], .index[href], .label[href], .annotation > a[href], .reference > a[href]'));
-  assert(opts.id !== '' || !opts.footnotes?.references.querySelector('[id], .index[href], .label[href]'));
+  assert(opts.id !== '' || !opts.notes?.references.querySelector('[id], .index[href], .label[href]'));
   return node;
 }

package/src/parser/block/blockquote.ts

@@ -41,7 +41,7 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
         const references = html('ol', { class: 'references' });
         const document = parse(source, {
           id: '',
-          footnotes: {
+          notes: {
             references,
           },
         }, context);

package/src/parser/block/extension/aside.ts

@@ -1,6 +1,6 @@
 import { ExtensionParser } from '../../block';
 import { block, validate, fence, fmap } from '../../../combinator';
-import { identity, text } from '../../inline/extension/indexee';
+import { identity, index } from '../../inline/extension/indexee';
 import { parse } from '../../api/parse';
 import { html } from 'typed-dom/dom';
 
@@ -21,7 +21,7 @@ export const aside: ExtensionParser.AsideParser = block(validate('~~~', fmap(
     const references = html('ol', { class: 'references' });
     const document = parse(body.slice(0, -1), {
       id: '',
-      footnotes: {
+      notes: {
         references,
       },
     }, context);
@@ -34,9 +34,9 @@ export const aside: ExtensionParser.AsideParser = block(validate('~~~', fmap(
       'data-invalid-type': 'content',
       'data-invalid-message': 'Missing the title at the first line',
     }, `${opener}${body}${closer}`)];
-    assert(identity(context.id, text(heading)));
+    assert(identity(context.id, index(heading)));
     return [
-      html('aside', { id: identity(context.id, text(heading)), class: 'aside' }, [
+      html('aside', { id: identity(context.id, index(heading)), class: 'aside' }, [
         document,
         html('h2', 'References'),
         references,

package/src/parser/block/extension/example.ts

@@ -26,7 +26,7 @@ export const example: ExtensionParser.ExampleParser = block(validate('~~~', fmap
         const references = html('ol', { class: 'references' });
         const document = parse(body.slice(0, -1), {
           id: '',
-          footnotes: {
+          notes: {
             references,
           },
         }, context);

package/src/parser/inline/autolink/url.ts

@@ -13,7 +13,7 @@ export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'ht
     url => `{ ${url} }`,
     union([unsafelink])))));
 
-export const lineurl: AutolinkParser.UrlParser.LineUrlParser = open(
+export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => open(
   linebreak,
   tails([
     str('!'),
@@ -22,7 +22,7 @@ export const lineurl: AutolinkParser.UrlParser.LineUrlParser = open(
       convert(
         url => `{ ${url} }`,
         unsafelink)),
-  ]));
+  ])));
 
 const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creation(precedence(2, union([
   surround('(', some(union([bracket, unescsource]), ')'), ')', true),

package/src/parser/inline/autolink.ts

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../inline';
-import { union, some, syntax, constraint, validate, focus, fmap } from '../../combinator';
+import { union, some, syntax, constraint, validate, focus, lazy, fmap } from '../../combinator';
 import { url, lineurl } from './autolink/url';
 import { email } from './autolink/email';
 import { channel } from './autolink/channel';
@@ -11,7 +11,7 @@ import { str } from '../source';
 import { Syntax, State } from '../context';
 import { stringify } from '../util';
 
-export const autolink: AutolinkParser =
+export const autolink: AutolinkParser = lazy(() =>
   validate(/^(?:[@#>0-9a-z\r\n]|\S[#>])/i,
   constraint(State.autolink, false,
   syntax(Syntax.autolink, 1, 1, ~State.shortcut,
@@ -44,4 +44,4 @@ export const autolink: AutolinkParser =
       anchor,
     ])),
     ns => ns.length === 1 ? ns : [stringify(ns)]),
-  ]))));
+  ])))));

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/figure.ts

@@ -6,12 +6,12 @@ import { querySelectorAll } from 'typed-dom/query';
 
 export function* figure(
   target: ParentNode & Node,
-  footnotes?: { readonly references: HTMLOListElement; },
+  notes?: { readonly references: HTMLOListElement; },
   opts: { readonly id?: string; } = {},
 ): Generator<HTMLAnchorElement | undefined, undefined, undefined> {
   const refs = new MultiQueue<string, HTMLAnchorElement>(push(
     querySelectorAll(target, 'a.label:not(.disabled)[data-label]'),
-    footnotes && querySelectorAll(footnotes.references, 'a.label:not(.disabled)') || [])
+    notes && querySelectorAll(notes.references, 'a.label:not(.disabled)') || [])
     .map(el => [el.getAttribute('data-label')!, el]));
   const labels = new Set<string>();
   const numbers = new Map<string, string>();