securemark 0.275.0 → 0.275.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.275.2
+
+- Fix identifiers.
+
+## 0.275.1
+
+- Fix identifiers.
+
 ## 0.275.0
 
 - Fix identifiers.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.275.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.275.2 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"));
@@ -6185,14 +6185,14 @@ function identity(id, text, type = 'index') {
   if (id === '') return undefined;
   text &&= text.trim().replace(/\s+/g, '_');
   if (text === '') return undefined;
-  if (text.length <= 100 || type === '') return `${type}:${id ?? ''}:${text}`;
+  if (text.length <= 120 || type === '') return `${type}:${id ?? ''}:${text}`;
   const cs = [...text];
-  if (cs.length <= 100) return `${type}:${id ?? ''}:${text}`;
+  if (cs.length <= 120) return `${type}:${id ?? ''}:${text}`;
   switch (type) {
     case 'index':
-      return `${type}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
+      return `${type}:${id ?? ''}:${cs.slice(0, 120 - 3).join('')}...`;
     case 'mark':
-      return `${type}:${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;
@@ -6291,7 +6291,7 @@ exports.indexer = (0, combinator_1.creation)((0, combinator_1.fmap)((0, combinat
 // Indexer is invisible but invalids must be visible.
 ([el]) => el.getElementsByClassName('invalid').length === 0), ([el]) => [(0, dom_1.html)('span', {
   class: 'indexer',
-  'data-index': el.getAttribute('href').slice(1).replace(/^\w+:\w*:/, '')
+  'data-index': el.getAttribute('href').slice(1).replace(/^[^:]*:[^:]*:/, '')
 })]));
 
 /***/ }),

package/package.json

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

@@ -15,23 +15,23 @@ export function identity(id: string | undefined, text: string, type: 'index' | '
   if (id === '') return undefined;
   text &&= text.trim().replace(/\s+/g, '_');
   if (text === '') return undefined;
-  if (text.length <= 100 || type === '') return `${type}:${id ?? ''}:${text}`;
+  if (text.length <= 120 || type === '') return `${type}:${id ?? ''}:${text}`;
   const cs = [...text];
-  if (cs.length <= 100) return `${type}:${id ?? ''}:${text}`;
+  if (cs.length <= 120) return `${type}:${id ?? ''}:${text}`;
   switch (type) {
     case 'index':
-      return `${type}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
+      return `${type}:${id ?? ''}:${cs.slice(0, 120 - 3).join('')}...`;
     case 'mark':
-      return `${type}:${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'));

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

@@ -15,5 +15,8 @@ export const indexer: ExtensionParser.IndexerParser = creation(fmap(verify(surro
   // Indexer is invisible but invalids must be visible.
   ([el]) => el.getElementsByClassName('invalid').length === 0),
   ([el]) => [
-    html('span', { class: 'indexer', 'data-index': el.getAttribute('href')!.slice(1).replace(/^\w+:\w*:/, '') }),
+    html('span', {
+      class: 'indexer',
+      'data-index': el.getAttribute('href')!.slice(1).replace(/^[^:]*:[^:]*:/, ''),
+    }),
   ]));