securemark 0.280.5 → 0.280.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.280.7
+
+- Refactoring.
+
+## 0.280.6
+
+- Refactoring.
+
 ## 0.280.5
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.280.5 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.280.7 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"));
@@ -6244,16 +6244,21 @@ function indexee(parser, optional) {
 exports.indexee = indexee;
 function identity(id, text, type = 'index') {
   if (id === '') return undefined;
-  text &&= text.trim().replace(/\s+/g, '_');
+  text &&= text.trim().replace(/\s\s+/g, ' ');
   if (text === '') return undefined;
-  if (text.length <= 120 || type === '') return `${type}:${id ?? ''}:${text}`;
+  const hash = text.replace(/\s/g, '_');
+  if (hash.length <= 120 || type === '') return `${type}:${id ?? ''}:${hash}`;
   const cs = [...text];
-  if (cs.length <= 120) return `${type}:${id ?? ''}:${text}`;
+  if (cs.length <= 120) return `${type}:${id ?? ''}:${hash}`;
+  const ellipsis = '...';
+  const len = (120 - ellipsis.length * 2) / 3 | 0;
   switch (type) {
     case 'index':
-      return `${type}:${id ?? ''}:${cs.slice(0, 120 - 3).join('')}...`;
     case 'mark':
-      return `${type}:${id ?? ''}:${cs.slice(0, 38).join('')}...${cs.slice(cs.length / 2 - 38 / 2 | 0).slice(0, 38).join('')}...${cs.slice(-38).join('')}`;
+      const s1 = hash.slice(0, cs.slice(0, len).join('').trimEnd().length);
+      const s3 = hash.slice(-cs.slice(-len).join('').trimStart().length);
+      const s2 = cs.slice(cs.length / 2 - len / 2 - (len - s1.length) | 0).slice(0, len + len - s3.length).join('').trim().replace(/\s/g, '_');
+      return `${type}:${id ?? ''}:${s1}${ellipsis}${s2}${ellipsis}${s3}`;
   }
 }
 exports.identity = identity;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.280.5",
+  "version": "0.280.7",
   "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

@@ -13,25 +13,27 @@ export function identity(id: string | undefined, text: string, type: 'index' | '
   assert(!id?.match(/[^0-9a-z/-]/i));
   assert(!text.includes('\n'));
   if (id === '') return undefined;
-  text &&= text.trim().replace(/\s+/g, '_');
+  text &&= text.trim().replace(/\s\s+/g, ' ');
   if (text === '') return undefined;
-  if (text.length <= 120 || type === '') return `${type}:${id ?? ''}:${text}`;
+  const hash = text.replace(/\s/g, '_');
+  if (hash.length <= 120 || type === '') return `${type}:${id ?? ''}:${hash}`;
   const cs = [...text];
-  if (cs.length <= 120) return `${type}:${id ?? ''}:${text}`;
+  if (cs.length <= 120) return `${type}:${id ?? ''}:${hash}`;
+  const ellipsis = '...';
+  const len = (120 - ellipsis.length * 2) / 3 | 0;
   switch (type) {
     case 'index':
-      return `${type}:${id ?? ''}:${cs.slice(0, 120 - 3).join('')}...`;
     case 'mark':
-      return `${type}:${id ?? ''}:${cs.slice(0, 38).join('')}...${cs.slice(cs.length / 2 - 38 / 2 | 0).slice(0, 38).join('')}...${cs.slice(-38).join('')}`;
+      const s1 = hash.slice(0, cs.slice(0, len).join('').trimEnd().length);
+      const s3 = hash.slice(-cs.slice(-len).join('').trimStart().length);
+      const s2 = cs.slice(cs.length / 2 - len / 2 - (len - s1.length) | 0).slice(0, len + len - s3.length).join('').trim().replace(/\s/g, '_');
+      return `${type}:${id ?? ''}:${s1}${ellipsis}${s2}${ellipsis}${s3}`;
   }
   assert(false);
 }
 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);
+assert(identity(undefined, '0'.repeat(41) + '1'.repeat(38) + '2'.repeat(41) + 3)!.slice(7) === '0'.repeat(38) + '...' + '1'.repeat(38) + '...' + '2'.repeat(38 - 1) + 3);
+assert(identity(undefined, '0'.repeat(81) + '1'.repeat(38) + '2'.repeat(81) + 3)!.slice(7) === '0'.repeat(38) + '...' + '1'.repeat(38) + '...' + '2'.repeat(38 - 1) + 3);
 
 export function index(source: Element, optional = false): string {
   assert(!source.matches('.indexer'));