securemark 0.274.4 → 0.275.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.275.1
+
+- Fix identifiers.
+
+## 0.275.0
+
+- Fix identifiers.
+
 ## 0.274.4
 
 - Fix list item parser.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.274.4 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.275.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"));
@@ -6169,7 +6169,7 @@ const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, comb
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.text = exports.index = exports.identity = exports.indexee = void 0;
+exports.text = exports.signature = exports.index = exports.identity = exports.indexee = void 0;
 const combinator_1 = __webpack_require__(2087);
 const memoize_1 = __webpack_require__(1808);
 const dom_1 = __webpack_require__(3252);
@@ -6181,17 +6181,18 @@ function indexee(parser, optional) {
   })]);
 }
 exports.indexee = indexee;
-function identity(id, text, name = 'index') {
+function identity(id, text, type = 'index') {
   if (id === '') return undefined;
   text &&= text.trim().replace(/\s+/g, '_');
   if (text === '') return undefined;
+  if (text.length <= 120 || type === '') return `${type}:${id ?? ''}:${text}`;
   const cs = [...text];
-  if (cs.length <= 100) return `${name}:${id ?? ''}:${text}`;
-  switch (name) {
+  if (cs.length <= 120) return `${type}:${id ?? ''}:${text}`;
+  switch (type) {
     case 'index':
-      return `${name}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
+      return `${type}:${id ?? ''}:${cs.slice(0, 120 - 3).join('')}...`;
     case 'mark':
-      return `${name}:${id ?? ''}:${cs.slice(0, 50).join('')}...${cs.slice(-47).join('')}`;
+      return `${type}:${id ?? ''}:${cs.slice(0, 38).join('')}...${cs.slice(cs.length / 2 - 38 / 2 | 0).slice(0, 38).join('')}...${cs.slice(-38).join('')}`;
   }
 }
 exports.identity = identity;
@@ -6201,9 +6202,43 @@ function index(source, optional = false) {
   const index = indexer?.getAttribute('data-index');
   if (index) return index;
   if (index === '' && optional) return '';
-  return (0, exports.text)(source);
+  return signature(source);
 }
 exports.index = index;
+function signature(source) {
+  const target = source.cloneNode(true);
+  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .label[data-label], .comment, 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':
+        el.remove();
+        continue;
+    }
+    switch (el.className) {
+      case 'math':
+        el.replaceWith(el.getAttribute('data-src'));
+        continue;
+      case 'label':
+        el.replaceWith(`[$${el.getAttribute('data-label').replace('$', '')}]`);
+        continue;
+      case 'comment':
+      case 'checkbox':
+      case 'annotation':
+      case 'reference':
+        el.remove();
+        continue;
+    }
+  }
+  return target.textContent.trim();
+}
+exports.signature = signature;
 exports.text = (0, memoize_1.reduce)(source => {
   const target = source.cloneNode(true);
   for (let es = target.querySelectorAll('code[data-src], .math[data-src], .comment, rt, rp, br, .annotation, .reference, .checkbox, ul, ol'), len = es.length, i = 0; i < len; ++i) {
@@ -6232,8 +6267,6 @@ exports.text = (0, memoize_1.reduce)(source => {
         continue;
     }
   }
-  // Better:
-  //return target.innerText;
   return target.textContent;
 });
 
@@ -6594,7 +6627,7 @@ exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, sourc
 }) => {
   const el = (0, dom_1.html)('mark', (0, dom_1.defrag)(bs));
   return [[(0, dom_1.define)(el, {
-    id: state & (256 /* State.annotation */ | 128 /* State.reference */) ? undefined : (0, indexee_1.identity)(id, (0, indexee_1.text)(el), 'mark')
+    id: state & (256 /* State.annotation */ | 128 /* State.reference */) ? undefined : (0, indexee_1.identity)(id, (0, indexee_1.signature)(el), 'mark')
   }), el.id && (0, dom_1.html)('a', {
     href: `#${el.id}`
   })], rest];
@@ -7114,7 +7147,7 @@ function build(syntax, marker, splitter = '') {
         }
       }
       const abbr = ref.getAttribute('data-abbr') || undefined;
-      const identifier = (0, indexee_1.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 : (0, indexee_1.text)(ref.firstElementChild), 'mark')?.slice(6) || '';
+      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)(undefined, (0, indexee_1.signature)(ref.firstElementChild), 'mark')?.slice(6) || '';
       const refSubindex = refSubindexes.get(identifier) + 1 || 1;
       refSubindexes.set(identifier, refSubindex);
       const refId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:ref:${identifier}:${refSubindex}` : undefined;
@@ -7131,7 +7164,7 @@ function build(syntax, marker, splitter = '') {
       initial && defs.set(identifier, def);
       const defIndex = initial ? total + defs.size : defIndexes.get(def);
       initial && defIndexes.set(def, defIndex);
-      const title = initial ? (0, indexee_1.text)(ref.firstElementChild) : titles.get(identifier);
+      const title = initial ? (0, indexee_1.text)(ref.firstElementChild).trim() : titles.get(identifier);
       initial && titles.set(identifier, title);
       ref.firstElementChild.hasAttribute('hidden') ? ref.lastElementChild.remove() : ref.firstElementChild.setAttribute('hidden', '');
       (0, dom_1.define)(ref, {
@@ -7158,7 +7191,7 @@ function build(syntax, marker, splitter = '') {
       }, marker(defIndex, abbr)));
       def.lastElementChild.appendChild((0, dom_1.html)('a', {
         href: refId && `#${refId}`,
-        title: abbr && (0, indexee_1.text)((0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes)).trim() || undefined
+        title: abbr && (initial ? title : (0, indexee_1.text)(ref.firstElementChild).trim()) || undefined
       }, `^${++refIndex}`));
     }
     if (note || defs.size > 0) {

package/package.json

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

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

@@ -207,8 +207,8 @@ describe('Unit: parser/api/parse', () => {
         [...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):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">*1</a></sup><sup class="reference" data-abbr="B" id="reference::ref:B: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):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:B:2" title="(1)"><span hidden=""></span><a href="#reference::def:B">[B]</a></sup></span><sup><a href="#annotation::ref:(1):1">^1</a></sup></li></ol>',
+          '<p><sup class="annotation" id="annotation::ref:[$-a]: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:[$-a]:1">*1</a></sup><sup class="reference" data-abbr="B" id="reference::ref:B: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:[$-a]: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:B:2" title="(1)"><span hidden=""></span><a href="#reference::def:B">[B]</a></sup></span><sup><a href="#annotation::ref:[$-a]:1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(
         notes.references.outerHTML,

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

@@ -9,28 +9,29 @@ export function indexee(parser: Parser<HTMLElement, MarkdownParser.Context>, opt
   return fmap(parser, ([el], _, { id }) => [define(el, { id: identity(id, index(el, optional)) })]);
 }
 
-export function identity(id: string | undefined, text: string, name: 'index' | 'mark' = 'index'): string | undefined {
+export function identity(id: string | undefined, text: string, type: 'index' | 'mark' | '' = 'index'): string | undefined {
   assert(!id?.match(/[^0-9a-z/-]/i));
   assert(!text.includes('\n'));
   if (id === '') return undefined;
   text &&= text.trim().replace(/\s+/g, '_');
   if (text === '') return undefined;
+  if (text.length <= 120 || type === '') return `${type}:${id ?? ''}:${text}`;
   const cs = [...text];
-  if (cs.length <= 100) return `${name}:${id ?? ''}:${text}`;
-  switch (name) {
+  if (cs.length <= 120) return `${type}:${id ?? ''}:${text}`;
+  switch (type) {
     case 'index':
-      return `${name}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
+      return `${type}:${id ?? ''}:${cs.slice(0, 120 - 3).join('')}...`;
     case 'mark':
-      return `${name}:${id ?? ''}:${cs.slice(0, 50).join('')}...${cs.slice(-47).join('')}`;
+      return `${type}:${id ?? ''}:${cs.slice(0, 38).join('')}...${cs.slice(cs.length / 2 - 38 / 2 | 0).slice(0, 38).join('')}...${cs.slice(-38).join('')}`;
   }
   assert(false);
 }
-assert(identity(undefined, '0'.repeat(100 - 1) + 1)!.slice(7) === '0'.repeat(100 - 1) + 1);
-assert(identity(undefined, '0'.repeat(100) + 1)!.slice(7) === '0'.repeat(97) + '...');
-assert(identity(undefined, '0'.repeat(200) + 1)!.slice(7) === '0'.repeat(97) + '...');
-assert(identity(undefined, '0'.repeat(100 - 1) + 1, 'mark')!.slice(6) === '0'.repeat(100 - 1) + 1);
-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);
+assert(identity(undefined, '0'.repeat(120 - 1) + 1)!.slice(7) === '0'.repeat(120 - 1) + 1);
+assert(identity(undefined, '0'.repeat(120) + 1)!.slice(7) === '0'.repeat(117) + '...');
+assert(identity(undefined, '0'.repeat(200) + 1)!.slice(7) === '0'.repeat(117) + '...');
+assert(identity(undefined, '0'.repeat(120 - 1) + 1, 'mark')!.slice(6) === '0'.repeat(120 - 1) + 1);
+assert(identity(undefined, '0'.repeat(41) + '1'.repeat(38) + '2'.repeat(41) + 3, 'mark')!.slice(6) === '0'.repeat(38) + '...' + '1'.repeat(38) + '...' + '2'.repeat(38 - 1) + 3);
+assert(identity(undefined, '0'.repeat(81) + '1'.repeat(38) + '2'.repeat(81) + 3, 'mark')!.slice(6) === '0'.repeat(38) + '...' + '1'.repeat(38) + '...' + '2'.repeat(38 - 1) + 3);
 
 export function index(source: Element, optional = false): string {
   assert(source instanceof DocumentFragment || !source.matches('.indexer'));
@@ -40,7 +41,43 @@ export function index(source: Element, optional = false): string {
   const index = indexer?.getAttribute('data-index');
   if (index) return index;
   if (index === '' && optional) return '';
-  return text(source);
+  return signature(source);
+}
+
+export function signature(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], .label[data-label], .comment, 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':
+        el.remove();
+        continue;
+    }
+    switch (el.className) {
+      case 'math':
+        el.replaceWith(el.getAttribute('data-src')!);
+        continue;
+      case 'label':
+        el.replaceWith(`[$${el.getAttribute('data-label')!.replace('$', '')}]`);
+        continue;
+      case 'comment':
+      case 'checkbox':
+      case 'annotation':
+      case 'reference':
+        el.remove();
+        continue;
+    }
+  }
+  return target.textContent!.trim();
 }
 
 export const text = reduce((source: Element | DocumentFragment): string => {
@@ -73,7 +110,5 @@ export const text = reduce((source: Element | DocumentFragment): string => {
         continue;
     }
   }
-  // Better:
-  //return target.innerText;
   return target.textContent!;
 });

package/src/parser/inline/mark.ts

@@ -1,7 +1,7 @@
 import { MarkParser } from '../inline';
 import { union, some, syntax, constraint, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
-import { identity, text } from './extension/indexee';
+import { identity, signature } from './extension/indexee';
 import { str } from '../source';
 import { startTight, blankWith } from '../visibility';
 import { Syntax, State } from '../context';
@@ -23,7 +23,7 @@ export const mark: MarkParser = lazy(() => surround(
       define(el, {
         id: state! & (State.annotation | State.reference)
           ? undefined
-          : identity(id, text(el), 'mark'),
+          : identity(id, signature(el), 'mark'),
       }),
       el.id && html('a', { href: `#${el.id}` }),
     ], rest];

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

@@ -1,9 +1,10 @@
 import { figure } from './figure';
+import { ParserOptions } from '../../..';
 import { parse as parse_ } from '../../parser';
 import { html } from 'typed-dom/dom';
 import { normalize } from '../../debug.test';
 
-const parse = (s: string) => parse_(s, { test: true });
+const parse = (s: string, o?: ParserOptions) => parse_(s, { test: true, ...o });
 
 describe('Unit: parser/processor/figure', () => {
   describe('figure', () => {
@@ -278,15 +279,17 @@ describe('Unit: parser/processor/figure', () => {
     it('id', () => {
       const target = parse([
         '$test-a\n> ',
-        '$test-a',
-      ].join('\n\n'));
+        '==$test-a==',
+        '- $test-a',
+      ].join('\n\n'), { id: '0' });
       for (let i = 0; i < 3; ++i) {
         [...figure(target, undefined, { id: '0' })];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
             '<figure data-type="quote" data-label="test-a" data-group="test" data-number="1" id="label:0:test-a"><figcaption><span class="figindex">Test 1. </span><span class="figtext"></span></figcaption><div><blockquote></blockquote></div></figure>',
-            '<p><a class="label" data-label="test-a" href="#label:0:test-a">Test 1</a></p>',
+            '<p><mark id="mark:0:[$test-a]"><a class="label" data-label="test-a" href="#label:0:test-a">Test 1</a></mark><a href="#mark:0:[$test-a]"></a></p>',
+            '<ul><li id="index:0:[$test-a]"><a class="label" data-label="test-a" href="#label:0:test-a">Test 1</a></li></ul>',
           ]);
       }
     });

package/src/parser/processor/note.ts

@@ -1,6 +1,6 @@
-import { identity, text } from '../inline/extension/indexee';
+import { identity, signature, text } from '../inline/extension/indexee';
 import { markInvalid, unmarkInvalid } from '../util';
-import { frag, html, define } from 'typed-dom/dom';
+import { html, define } from 'typed-dom/dom';
 
 export function* note(
   target: ParentNode & Node,
@@ -70,15 +70,16 @@ function build(
         }
       }
       const abbr = ref.getAttribute('data-abbr') || undefined;
-      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 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 refSubindex = refSubindexes.get(identifier)! + 1 || 1;
       refSubindexes.set(identifier, refSubindex);
       const refId = opts.id !== ''
@@ -107,7 +108,7 @@ function build(
         : defIndexes.get(def)!;
       initial && defIndexes.set(def, defIndex);
       const title = initial
-        ? text(ref.firstElementChild!)
+        ? text(ref.firstElementChild!).trim()
         : titles.get(identifier)!;
       initial && titles.set(identifier, title);
       assert(syntax !== 'annotation' || title);
@@ -139,7 +140,7 @@ function build(
         html('a',
           {
             href: refId && `#${refId}`,
-            title: abbr && text(frag(ref.firstElementChild!.cloneNode(true).childNodes)).trim() || undefined,
+            title: abbr && (initial ? title : text(ref.firstElementChild!).trim()) || undefined,
           },
           `^${++refIndex}`));
     }