securemark 0.297.0 → 0.297.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.297.1
+
+- Fix note processing.
+
 ## 0.297.0
 
 - Enhance annotation parser to allow nested annotations.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.297.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.297.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("Prism"), require("DOMPurify"));
@@ -7123,22 +7123,8 @@ function baseR(n, r) {
   return acc;
 }
 function signature(target) {
-  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, .checkbox, ul, ol, .label[data-label]'), len = es.length, i = 0; i < len; ++i) {
+  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, :is(.annotation, .reference) > a, .checkbox, ul, ol, .label[data-label]'), len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
-    switch (el.tagName) {
-      case 'CODE':
-        el.replaceWith(el.getAttribute('data-src'));
-        continue;
-      case 'RT':
-      case 'RP':
-      case 'UL':
-      case 'OL':
-        el.remove();
-        continue;
-      case 'BR':
-        el.replaceWith('\n');
-        continue;
-    }
     switch (el.className) {
       case 'math':
         el.replaceWith(el.getAttribute('data-src'));
@@ -7153,25 +7139,28 @@ function signature(target) {
         el.remove();
         continue;
     }
-  }
-  return target.textContent.trim();
-}
-exports.signature = signature;
-function text(target) {
-  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, .checkbox, ul, ol'), len = es.length, i = 0; i < len; ++i) {
-    const el = es[i];
     switch (el.tagName) {
       case 'CODE':
         el.replaceWith(el.getAttribute('data-src'));
         continue;
-      case 'RT':
-      case 'RP':
-      case 'BR':
       case 'UL':
       case 'OL':
+      case 'RT':
+      case 'RP':
+      case 'A':
         el.remove();
         continue;
+      case 'BR':
+        el.replaceWith('\n');
+        continue;
     }
+  }
+  return target.textContent.trim();
+}
+exports.signature = signature;
+function text(target) {
+  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, :is(.annotation, .reference) > a, .checkbox, ul, ol'), len = es.length, i = 0; i < len; ++i) {
+    const el = es[i];
     switch (el.className) {
       case 'math':
         el.replaceWith(el.getAttribute('data-src'));
@@ -7183,6 +7172,19 @@ function text(target) {
         el.remove();
         continue;
     }
+    switch (el.tagName) {
+      case 'CODE':
+        el.replaceWith(el.getAttribute('data-src'));
+        continue;
+      case 'UL':
+      case 'OL':
+      case 'RT':
+      case 'RP':
+      case 'A':
+      case 'BR':
+        el.remove();
+        continue;
+    }
   }
   return target.textContent;
 }
@@ -8273,19 +8275,19 @@ function* note(target, notes, opts = {}, bottom = null) {
   yield* (0, exports.reference)(target, notes?.references, opts, bottom);
 }
 exports.note = note;
-exports.annotation = build('annotation', 'sup.annotation:not(.annotations .annotation)', n => `*${n}`, 'h1, h2, h3, h4, h5, h6, aside.aside, hr');
-exports.reference = build('reference', 'sup.reference:not(.references .reference)', (n, abbr) => `[${abbr || n}]`);
+exports.annotation = build('annotation', 'annotations', n => `*${n}`, 'h1, h2, h3, h4, h5, h6, aside.aside, hr');
+exports.reference = build('reference', 'references', (n, abbr) => `[${abbr || n}]`);
 // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
 // 構文ごとに各1回の処理では不可能
-function build(syntax, query, marker, splitter = '') {
-  splitter &&= `${splitter}, .${syntax}s`;
+function build(syntax, plural, marker, splitter = '') {
+  splitter &&= `${splitter}, .${plural}`;
   const refMemoryCaller = (0, memoize_1.memoize)(target => new Map() ?? target, new WeakMap());
   return function* (target, note, opts = {}, bottom = null) {
     const refMemory = refMemoryCaller(target);
     const refInfoCaller = (0, memoize_1.memoize)(ref => {
       const content = ref.firstElementChild;
       const abbr = ref.getAttribute('data-abbr') ?? '';
-      const clone = content.cloneNode(true);
+      const clone = ref.cloneNode(true);
       const txt = (0, indexee_1.text)(clone).trim();
       const identifier = abbr ? (0, indexee_1.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) || '' : (0, indexee_1.identity)('mark', undefined, (0, indexee_1.signature)(clone))?.slice(6) || '';
       return {
@@ -8299,11 +8301,11 @@ function build(syntax, query, marker, splitter = '') {
       content
     }] of refMemory) {
       content.replaceWith(content.cloneNode(true));
-      ref.prepend(content);
+      ref.replaceChildren(content);
       refMemory.delete(ref);
     }
     const defs = new Map();
-    const refs = target.querySelectorAll(`${query}:not(.disabled)`);
+    const refs = target.querySelectorAll(`.${syntax}:not(.${plural} .${syntax}):not(.disabled)`);
     const identifierInfoCaller = (0, memoize_1.memoize)(identifier => ({
       defIndex: 0,
       defSubindex: 0,
@@ -8329,7 +8331,7 @@ function build(syntax, query, marker, splitter = '') {
         if (defs.size > 0) {
           total += defs.size;
           const note = el.tagName === 'OL' ? el : target.insertBefore((0, dom_1.html)('ol', {
-            class: `${syntax}s`
+            class: plural
           }), el);
           yield* proc(defs, note);
         }
@@ -8394,7 +8396,7 @@ function build(syntax, query, marker, splitter = '') {
     if (note || defs.size > 0) {
       const el = splitters[iSplitters];
       note ??= el?.tagName === 'OL' && el.nextElementSibling == splitters[iSplitters + 1] ? (++iSplitters, el) : target.insertBefore((0, dom_1.html)('ol', {
-        class: `${syntax}s`
+        class: plural
       }), splitters[iSplitters] ?? bottom);
       yield* proc(defs, note);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.297.0",
+  "version": "0.297.1",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",

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

@@ -109,23 +109,9 @@ assert(baseR(62, 62) === '10');
 export function signature(target: Element | DocumentFragment): string {
   assert(!target.parentNode);
   assert(!target.querySelector('br:not(:has(+ :is(ul, ol)))') || target.nodeName === 'MARK');
-  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, .checkbox, ul, ol, .label[data-label]'),
+  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, :is(.annotation, .reference) > a, .checkbox, ul, ol, .label[data-label]'),
            len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
-    switch (el.tagName) {
-      case 'CODE':
-        el.replaceWith(el.getAttribute('data-src')!);
-        continue;
-      case 'RT':
-      case 'RP':
-      case 'UL':
-      case 'OL':
-        el.remove();
-        continue;
-      case 'BR':
-        el.replaceWith('\n');
-        continue;
-    }
     switch (el.className) {
       case 'math':
         el.replaceWith(el.getAttribute('data-src')!);
@@ -140,28 +126,31 @@ export function signature(target: Element | DocumentFragment): string {
         el.remove();
         continue;
     }
-  }
-  return target.textContent!.trim();
-}
-
-export function text(target: Element | DocumentFragment): string {
-  assert(!target.parentNode);
-  assert(!target.querySelector('br:not(:has(+ :is(ul, ol)))'));
-  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, .checkbox, ul, ol'),
-           len = es.length, i = 0; i < len; ++i) {
-    const el = es[i];
     switch (el.tagName) {
       case 'CODE':
         el.replaceWith(el.getAttribute('data-src')!);
         continue;
-      case 'RT':
-      case 'RP':
-      case 'BR':
       case 'UL':
       case 'OL':
+      case 'RT':
+      case 'RP':
+      case 'A':
         el.remove();
         continue;
+      case 'BR':
+        el.replaceWith('\n');
+        continue;
     }
+  }
+  return target.textContent!.trim();
+}
+
+export function text(target: Element | DocumentFragment): string {
+  assert(!target.parentNode);
+  assert(!target.querySelector('br:not(:has(+ :is(ul, ol)))'));
+  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, :is(.annotation, .reference) > a, .checkbox, ul, ol'),
+           len = es.length, i = 0; i < len; ++i) {
+    const el = es[i];
     switch (el.className) {
       case 'math':
         el.replaceWith(el.getAttribute('data-src')!);
@@ -173,6 +162,19 @@ export function text(target: Element | DocumentFragment): string {
         el.remove();
         continue;
     }
+    switch (el.tagName) {
+      case 'CODE':
+        el.replaceWith(el.getAttribute('data-src')!);
+        continue;
+      case 'UL':
+      case 'OL':
+      case 'RT':
+      case 'RP':
+      case 'A':
+      case 'BR':
+        el.remove();
+        continue;
+    }
   }
   return target.textContent!;
 }

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

@@ -222,7 +222,7 @@ describe('Unit: parser/processor/note', () => {
     });
 
     it('nest', () => {
-      const target = parse('((a((b))))((a))((b))');
+      const target = parse('((a((b((c))))))((a))((b))');
       for (let i = 0; i < 3; ++i) {
         [...annotation(target)];
         assert.deepStrictEqual(
@@ -249,21 +249,31 @@ describe('Unit: parser/processor/note', () => {
                 ]),
                 html('sup', [
                   html('a', { href: '#annotation::ref:a:1' }, '^1'),
-                  html('a', { href: '#annotation::ref:a:2' }, '^3'),
+                  html('a', { href: '#annotation::ref:a:2' }, '^4'),
                 ])
               ]),
               html('li', { id: 'annotation::def:b:1', 'data-marker': '*2' }, [
                 html('span', [
                   'b',
+                  html('sup', { class: 'annotation', id: 'annotation::ref:c:1', title: 'c' }, [
+                    html('a', { href: '#annotation::def:c:1' }, '*3')
+                  ]),
                 ]),
                 html('sup', [
                   html('a', { href: '#annotation::ref:b:1' }, '^2'),
-                  html('a', { href: '#annotation::ref:b:2' }, '^4'),
+                  html('a', { href: '#annotation::ref:b:2' }, '^5'),
+                ])
+              ]),
+              html('li', { id: 'annotation::def:c:1', 'data-marker': '*3' }, [
+                html('span', [
+                  'c',
+                ]),
+                html('sup', [
+                  html('a', { href: '#annotation::ref:c:1' }, '^3'),
                 ])
               ]),
             ]).outerHTML,
           ]);
-        target.lastChild?.remove();
       }
     });
 
@@ -376,7 +386,6 @@ describe('Unit: parser/processor/note', () => {
               ]),
             ]).outerHTML,
           ]);
-        target.lastChild?.remove();
       }
     });
 

package/src/parser/processor/note.ts

@@ -18,24 +18,24 @@ export function* note(
 
 export const annotation = build(
   'annotation',
-  'sup.annotation:not(.annotations .annotation)',
+  'annotations',
   n => `*${n}`,
   'h1, h2, h3, h4, h5, h6, aside.aside, hr');
 export const reference = build(
   'reference',
-  'sup.reference:not(.references .reference)',
+  'references',
   (n, abbr) => `[${abbr || n}]`);
 
 // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
 // 構文ごとに各1回の処理では不可能
 function build(
-  syntax: 'annotation' | 'reference',
-  query: `${keyof HTMLElementTagNameMap}.${string}`,
+  syntax: string,
+  plural: string,
   marker: (index: number, abbr: string) => string,
   splitter: string = '',
 ) {
   assert(syntax.match(/^[a-z]+$/));
-  splitter &&= `${splitter}, .${syntax}s`;
+  splitter &&= `${splitter}, .${plural}`;
   const refMemoryCaller = memoize((target: Node) =>
     new Map<HTMLElement, {
       readonly content: Element;
@@ -54,7 +54,7 @@ function build(
     const refInfoCaller = memoize((ref: HTMLElement) => {
       const content = ref.firstElementChild!;
       const abbr = ref.getAttribute('data-abbr') ?? '';
-      const clone = content.cloneNode(true);
+      const clone = ref.cloneNode(true);
       const txt = text(clone).trim();
       const identifier = abbr
         ? identity(
@@ -75,12 +75,12 @@ function build(
     }, refMemory);
     for (const [ref, { content }] of refMemory) {
       content.replaceWith(content.cloneNode(true));
-      ref.prepend(content);
+      ref.replaceChildren(content);
       refMemory.delete(ref);
     }
     assert(refMemory.size === 0);
     const defs = new Map<string, HTMLLIElement>();
-    const refs = target.querySelectorAll(`${query}:not(.disabled)`);
+    const refs = target.querySelectorAll<HTMLElement>(`.${syntax}:not(.${plural} .${syntax}):not(.disabled)`);
     const identifierInfoCaller = memoize((identifier: string) => ({
       defIndex: 0,
       defSubindex: 0,
@@ -104,7 +104,7 @@ function build(
         if (~iSplitters << 32 - 8 === 0) yield;
         if (!scope && el.parentNode !== target) continue;
         if (el.tagName === 'OL' && (el.nextElementSibling !== splitters[iSplitters + 1] || defs.size === 0)) {
-          assert(el.matches(`.${syntax}s`));
+          assert(el.matches(`.${plural}`));
           el.remove();
           continue;
         }
@@ -112,7 +112,7 @@ function build(
           total += defs.size;
           const note = el.tagName === 'OL'
             ? el as HTMLOListElement
-            : target.insertBefore(html('ol', { class: `${syntax}s` }), el);
+            : target.insertBefore(html('ol', { class: plural }), el);
           assert(note.parentNode);
           yield* proc(defs, note);
           assert(defs.size === 0);
@@ -188,7 +188,7 @@ function build(
       const el = splitters[iSplitters];
       note ??= el?.tagName === 'OL' && el.nextElementSibling == splitters[iSplitters + 1]
         ? (++iSplitters, el as HTMLOListElement)
-        : target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[iSplitters] ?? bottom);
+        : target.insertBefore(html('ol', { class: plural }), splitters[iSplitters] ?? bottom);
       yield* proc(defs, note);
       assert(defs.size === 0);
     }
@@ -196,7 +196,7 @@ function build(
       if (~iSplitters << 32 - 8 === 0) yield;
       if (!scope && el.parentNode !== target) continue;
       if (el.tagName === 'OL') {
-        assert(el.matches(`.${syntax}s`));
+        assert(el.matches(`.${plural}`));
         el.remove();
       }
     }