securemark 0.281.0 → 0.281.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.281.1
+
+- Fix identifiers.
+
 ## 0.281.0
 
 - Change identifiers.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.281.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.281.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"));
@@ -6093,9 +6093,8 @@ function identity(id, text, type = 'index') {
   text = text.trim();
   if (text === '') return undefined;
   const str = text.replace(/\s/g, '_');
-  if (str.length <= MAX || type === '') return `${type}:${id ?? ''}:${str}`;
   const cs = [...str];
-  if (cs.length <= MAX) return `${type}:${id ?? ''}:${str}`;
+  if (cs.length <= MAX || type === '') return `${type}:${id ?? ''}:${str}`;
   switch (type) {
     case 'index':
     case 'mark':
@@ -6106,21 +6105,21 @@ function identity(id, text, type = 'index') {
 }
 exports.identity = identity;
 function hash(source) {
-  let x = 1;
+  let x = 0;
   for (let i = 0; i < source.length; ++i) {
-    x ^= x << 13;
+    x ^= source.charCodeAt(i) << 1 | 1; // 16+1bit
+    x ^= x << 13; // shift <= 32-17bit
     x ^= x >>> 17;
     x ^= x << 15;
-    x ^= source.charCodeAt(i) << 11;
   }
   return x >>> 0;
 }
 function index(source, optional = false) {
   if (!source.firstChild) return '';
   const indexer = source.querySelector(':scope > .indexer');
-  const index = indexer?.getAttribute('data-index');
-  if (index) return index.replace(/=\w+$/, '');
-  if (index === '' && optional) return '';
+  const text = indexer?.getAttribute('data-index');
+  if (text === '' && optional) return '';
+  if (text) return [...text].length <= MAX ? text : text.replace(/=\w{1,7}$/, '');
   return signature(source);
 }
 exports.index = index;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.281.0",
+  "version": "0.281.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

@@ -18,61 +18,73 @@ export function identity(
   text: string,
   type: 'index' | 'mark' | '' = 'index',
 ): string | undefined {
-  assert(!id?.match(/[^0-9a-z/-]/i));
+  assert(id?.match(/^[0-9a-z/-]*$/i) ?? true);
   assert(!text.includes('\n'));
   if (id === '') return undefined;
   text = text.trim();
   if (text === '') return undefined;
   const str = text.replace(/\s/g, '_');
-  if (str.length <= MAX || type === '') return `${type}:${id ?? ''}:${str}`;
   const cs = [...str];
-  if (cs.length <= MAX) return `${type}:${id ?? ''}:${str}`;
+  if (cs.length <= MAX || type === '') return `${type}:${id ?? ''}:${str}`;
   switch (type) {
     case 'index':
     case 'mark':
       const s1 = cs.slice(0, PART + REM).join('');
       const s2 = cs.slice(-PART).join('');
+      assert([...`${s1}${ELLIPSIS}${s2}`].length === MAX);
       return `${type}:${id ?? ''}:${s1}${ELLIPSIS}${s2}=${hash(text).toString(36)}`;
   }
   assert(false);
 }
-function hash(source: string): number {
-  let x = 1;
-  assert(x !== 0);
-  for (let i = 0; i < source.length; ++i) {
-    x ^= x << 13;
-    x ^= x >>> 17;
-    x ^= x << 15;
-    x ^= source.charCodeAt(i) << 11;
-  }
-  return x >>> 0;
-}
 assert.deepStrictEqual(
   identity(undefined, `${'0'.repeat(MAX - 1)}1`)!.slice(7),
   `${'0'.repeat(MAX - 1)}1`);
 assert.deepStrictEqual(
   identity(undefined, `0${'1'.repeat(MAX / 2)}${'2'.repeat(MAX / 2)}3`)!.slice(7),
-  `0${'1'.repeat(PART + REM - 1)}${ELLIPSIS}${'2'.repeat(PART - 1)}3=x8ujbi`);
+  `0${'1'.repeat(PART + REM - 1)}${ELLIPSIS}${'2'.repeat(PART - 1)}3=mhy513`);
 assert.deepStrictEqual(
   identity(undefined, `0${'1'.repeat(MAX * 2)}${'2'.repeat(MAX * 2)}3`)!.slice(7),
-  `0${'1'.repeat(PART + REM - 1)}${ELLIPSIS}${'2'.repeat(PART - 1)}3=1c1m3g9`);
+  `0${'1'.repeat(PART + REM - 1)}${ELLIPSIS}${'2'.repeat(PART - 1)}3=12jqtiv`);
 assert.deepStrictEqual(
   identity(undefined, ` ${'0 '.repeat(MAX)}`)!.slice(7),
   identity(undefined, ` ${'0 '.repeat(MAX)}`.trim())!.slice(7));
 assert.notDeepStrictEqual(
   identity(undefined, `${'0 '.repeat(MAX)}`)!.slice(7),
   identity(undefined, `${'0_'.repeat(MAX)}`)!.slice(7));
+function hash(source: string): number {
+  let x = 0;
+  for (let i = 0; i < source.length; ++i) {
+    x ^= source.charCodeAt(i) << 1 | 1; // 16+1bit
+    x ^= x << 13; // shift <= 32-17bit
+    x ^= x >>> 17;
+    x ^= x << 15;
+  }
+  return x >>> 0;
+}
+assert(hash('\x00') !== 0);
+assert(hash('\x01') !== 0);
+assert(hash('\x00') !== hash(String.fromCharCode(1 << 15)));
 
 export function index(source: Element, optional = false): string {
   assert(!source.matches('.indexer'));
   assert(source.querySelectorAll(':scope > .indexer').length <= 1);
   if (!source.firstChild) return '';
   const indexer = source.querySelector(':scope > .indexer');
-  const index = indexer?.getAttribute('data-index');
-  if (index) return index.replace(/=\w+$/, '');
-  if (index === '' && optional) return '';
+  const text = indexer?.getAttribute('data-index');
+  if (text === '' && optional) return '';
+  if (text) return [...text].length <= MAX ? text : text.replace(/=\w{1,7}$/, '');
   return signature(source);
 }
+assert.deepStrictEqual(
+  index(define(document.createElement('b'), [
+    define(document.createElement('b'), { class: 'indexer', 'data-index': '0'.repeat(MAX - 2) + '=0' })
+  ])),
+  '0'.repeat(MAX - 2) + '=0');
+assert.deepStrictEqual(
+  index(define(document.createElement('b'), [
+    define(document.createElement('b'), { class: 'indexer', 'data-index': '0'.repeat(MAX) + '=0' })
+  ])),
+  '0'.repeat(MAX));
 
 export function signature(source: Element | DocumentFragment): string {
   assert(!navigator.userAgent.includes('Chrome') || !source.querySelector('br:not(:has(+ :is(ul, ol)))'));